From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 11 Feb 2011 15:25:47 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-29~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5f76bcaf939ce721752f741ee0f25b280c7a7794;p=plcapi.git

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

5f76bcaf939ce721752f741ee0f25b280c7a7794