From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 18 Oct 2010 21:19:29 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~303
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=aabb817adfe803f869cf01ebede47cceb005544d;p=platal.git

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

aabb817adfe803f869cf01ebede47cceb005544d