From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 12 Jan 2012 00:03:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: before-alchemy~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee94570f05f27873ccc107f5755e1f76d5bdb0a5;p=sfa.git

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

ee94570f05f27873ccc107f5755e1f76d5bdb0a5