Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Feb 2012 23:50:54 +0000 (00:50 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Feb 2012 23:50:54 +0000 (00:50 +0100)

Trivial merge