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

Merge commit 'origin/master'
---

06b05dc703a7c908b06d1362d31fe1c9c7966373