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

Merge commit 'origin/master'
---

a0b98745bd9a073d3ff9a91e33cbab0904dbfdf2