From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 4 Jul 2011 14:13:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-27~36^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b8859aad19bf19ffb7e1de9060fa38efde99d2f7;p=sfa.git

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

b8859aad19bf19ffb7e1de9060fa38efde99d2f7