From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 18 Nov 2010 09:23:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-19~56
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=641a829a3412936f80849d2bb43af54c4480d197;p=plcapi.git

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

641a829a3412936f80849d2bb43af54c4480d197