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

Trivial merge