From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 19 Nov 2010 14:39:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
X-Git-Tag: plcapi-5.0-19~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1a469b35434146b269d683fe262e477835e51d87;p=plcapi.git

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

1a469b35434146b269d683fe262e477835e51d87