Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Jan 2012 16:04:50 +0000 (17:04 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Jan 2012 16:04:50 +0000 (17:04 +0100)

Trivial merge