From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 18 Jul 2014 09:55:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.3-4~2
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=67f49d67394cb29352c506947471cbff50be65b6

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

67f49d67394cb29352c506947471cbff50be65b6