From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Sat, 31 Jul 2010 10:56:34 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: plcapi-5.0-16~1^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e9ce31d4a67348805b1855d09aa8e89f74196258;p=plcapi.git

Merge remote branch 'origin/master'
---

e9ce31d4a67348805b1855d09aa8e89f74196258