From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 7 Sep 2011 13:45:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-36~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=16b9b27493626e78ab9d8385b58f677273d72e51;hp=-c;p=sfa.git

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

16b9b27493626e78ab9d8385b58f677273d72e51