From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 21 Jun 2012 12:32:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-12~51
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=67288d32c856344f4084e93d97402d16c9a756f3

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

67288d32c856344f4084e93d97402d16c9a756f3