From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Dec 2010 22:48:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-11~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33d61c6bdaf6a691d50660627f28166b2d97653e;p=sfa.git

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

33d61c6bdaf6a691d50660627f28166b2d97653e