From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 25 Oct 2010 12:17:55 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1
X-Git-Tag: xorg/1.0.1~15
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9;p=platal.git

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

1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9