From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 12 May 2012 16:56:19 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-7~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c4e713b97658195775b8fd147b8ab9dceb785493;hp=-c

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

c4e713b97658195775b8fd147b8ab9dceb785493