From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 18 Dec 2010 15:25:49 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-12~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b55c56eb6fd30c34257b2c5bee26fdc60fafecc8;p=sfa.git

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

b55c56eb6fd30c34257b2c5bee26fdc60fafecc8