From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 6 Dec 2010 20:09:04 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-23~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6d1d60c9c2620e2fd725590a981537ea6f580994;p=plcapi.git

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

6d1d60c9c2620e2fd725590a981537ea6f580994