From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 30 Oct 2010 13:16:30 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~297
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3219716dae2eb88c498082b3aed0424b8b0b6981;p=platal.git

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

3219716dae2eb88c498082b3aed0424b8b0b6981