From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 28 Mar 2011 09:01:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-21-ckp1~74^2~44
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c9f86da04f9834904a8ce8618f3a6605f5a90af;p=sfa.git

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

0c9f86da04f9834904a8ce8618f3a6605f5a90af