From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 8 Mar 2011 23:24:44 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-30~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6e357334b71b8bfc4755fe65a13353b60609b785;p=plcapi.git

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

6e357334b71b8bfc4755fe65a13353b60609b785