From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 24 Mar 2011 21:49:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-21-ckp1~74^2~49
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7b1d7b3e31ed65be4cd6f43fa10dcdeae6e39a74;p=sfa.git

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

7b1d7b3e31ed65be4cd6f43fa10dcdeae6e39a74