From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 16 Jul 2010 13:19:09 +0000 (+0200)
Subject: Merge remote branch 'origin/platal-1.0.0'
X-Git-Tag: xorg/1.0.1~338
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1285cf5413df654ccac839b9d9a32c4df2cee95a;p=platal.git

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

1285cf5413df654ccac839b9d9a32c4df2cee95a