From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 3 Feb 2011 15:04:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-28~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bd7b9f706133094d52af73dcc6f43c920915ed02;p=plcapi.git

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

bd7b9f706133094d52af73dcc6f43c920915ed02