From: Christophe Poulain <cp@Debian.(none)>
Date: Mon, 17 Oct 2011 16:27:51 +0000 (+0200)
Subject: Merge branch 'master' of melusine.eu.org:mp-solid
X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=commitdiff_plain;h=9100d101b0c07b6c3510d76f95ec09f68831ca9d;p=mp-solid.git

Merge branch 'master' of melusine.eu.org:mp-solid
---

9100d101b0c07b6c3510d76f95ec09f68831ca9d