From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 9 May 2011 08:04:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-33~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8631db88c9b6273011bd2ccddc60c900ff22e0f5;hp=-c;p=plcapi.git

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

8631db88c9b6273011bd2ccddc60c900ff22e0f5