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

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

a499e55133403cf5ef2f35649105e525909b30a0