From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 19 Oct 2011 07:17:46 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-1~88^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7ea3d2f357e84a65423c91ee5b10bc41be81e6bf;hp=-c;p=sfa.git

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

7ea3d2f357e84a65423c91ee5b10bc41be81e6bf