From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 1 Sep 2010 08:21:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-16~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=29d91c387fae61de70b591ec877e6e3526ab51f1;p=plcapi.git

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

29d91c387fae61de70b591ec877e6e3526ab51f1