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

Merge commit 'origin/master'
---

d065e00d4caba638d145d11b37fa466e51cbc21b