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

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

49342aaf4ea7259820251017d38c24e1c2411b00