From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 8 Feb 2012 18:23:54 +0000 (+0100)
Subject: Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy
X-Git-Tag: sfa-2.1-3~15
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=dcf280965938c4ed1688b7a5d571188dfe4efdb3

Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy
---

dcf280965938c4ed1688b7a5d571188dfe4efdb3