From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 24 May 2011 15:45:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-22~13^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7841ee3ce022c84fcf9a8ea17ce12d52e36b3aaa;p=sfa.git

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

7841ee3ce022c84fcf9a8ea17ce12d52e36b3aaa