From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 29 Jun 2012 08:59:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-12~36
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7491c3a798a6856984c8872faa6061d5d61a4da6

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

7491c3a798a6856984c8872faa6061d5d61a4da6