From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 22 Feb 2013 15:13:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-25~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=25bb8471b60839c860d9418c1139ce0e1db3d990;hp=25bb8471b60839c860d9418c1139ce0e1db3d990;p=sfa.git

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