From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 29 Mar 2011 13:31:06 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-21-ckp1~74^2~40
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=364be2820af7d3c17da96edea8e6f398ff7070a3

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

364be2820af7d3c17da96edea8e6f398ff7070a3