From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 2 Nov 2010 21:46:27 +0000 (+0100)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~283
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3422f7193e38e67054d2ecda2f4a68b64bd310ef;p=platal.git

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

3422f7193e38e67054d2ecda2f4a68b64bd310ef