From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 16 May 2011 09:09:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-33~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=6d42fce241378ea4028cc579801dba59b5b83765;p=plcapi.git

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

6d42fce241378ea4028cc579801dba59b5b83765