From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Sep 2011 15:09:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-35~1^2
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=f1ed8fefee508394347561f0e14dbe5a3a76dc2b

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

f1ed8fefee508394347561f0e14dbe5a3a76dc2b