From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 11 Oct 2010 12:54:07 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~65
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=245923e335d0da5bec9495991a7846be9f0563ab;p=platal.git

Merge remote branch 'origin/platal-1.0.0'
---

245923e335d0da5bec9495991a7846be9f0563ab