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

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

d332e5a4e554961aedb715a06d79c890fdd06f88