From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 7 Jun 2012 09:17:34 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-11~2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4bb9f60eb04e6e7f63f22e1e384c6a306bae05bc

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

4bb9f60eb04e6e7f63f22e1e384c6a306bae05bc