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

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

7baf4dbbbacc5ef1d22b079d0e9c01396e19ad87