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

Merge commit 'origin/master'
---

53c87406a99b2f65bcfe00a050185139e97a0963