From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 25 May 2011 03:22:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-22~9^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb03ed0d8782ca4cbd58f02f9d9a31834a8c94d2;p=sfa.git

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

bb03ed0d8782ca4cbd58f02f9d9a31834a8c94d2