From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 7 Dec 2010 15:25:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-23~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=35fbb0b42f864cff0ae56b36a9f53155d9aca2e3;p=plcapi.git

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

35fbb0b42f864cff0ae56b36a9f53155d9aca2e3