From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 2 Dec 2010 23:11:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-20~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e75410b79d688f5bc44e15df26a079807c183f59;p=plcapi.git

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

e75410b79d688f5bc44e15df26a079807c183f59