From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 27 Mar 2012 12:30:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.1-1~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4e770b3cf4e6b16150fd479ace9854eaee3399b6;hp=-c;p=plcapi.git

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

4e770b3cf4e6b16150fd479ace9854eaee3399b6