From: root <root@blitz.inria.fr>
Date: Wed, 17 Nov 2010 20:58:52 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-19~56^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c996d4aac44f97bd24c64770fed4e6df854e7c9;p=plcapi.git

Merge commit 'origin/master'
---

5c996d4aac44f97bd24c64770fed4e6df854e7c9