From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 29 Aug 2010 17:38:40 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~249
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=853ff307303faf861396c4e22dbaa56114366751;p=platal.git

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

853ff307303faf861396c4e22dbaa56114366751