From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Sep 2010 11:09:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-18~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=f37a0b0587754b0c55a71092a48ec7522b4a20f9

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

f37a0b0587754b0c55a71092a48ec7522b4a20f9