From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 7 Jul 2011 10:29:08 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-34~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=97e45f2f1aace5f3f34eaa5170e45e915424fbb8;p=plcapi.git

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

97e45f2f1aace5f3f34eaa5170e45e915424fbb8