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

Merge commit 'origin/master'
---

32e6b3ac389e522e05b89833e9bd13ad853b6885