From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 7 Jun 2011 12:00:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-33~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=ea599807fccfe0890f3fa0c49a085a72426111f5

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

ea599807fccfe0890f3fa0c49a085a72426111f5