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

Merge commit 'origin/master'
---

ff5ac33c4014af79693a9e4ae4d2ea37bc475f19