From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 27 Oct 2011 08:04:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-1~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=27d5a9208546c7b633416d0efc8c46766945a363;hp=-c;p=sfa.git

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

27d5a9208546c7b633416d0efc8c46766945a363