From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 28 Jun 2013 07:18:31 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.2-7~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=580734af3f0a37c12ace7909e6bf7978fe16778e

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

580734af3f0a37c12ace7909e6bf7978fe16778e