From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 3 Oct 2010 10:05:51 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~116
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=12ddbc2037b16496dfb9d91c4f7091850146fcde;p=platal.git

Merge branch 'platal-1.0.0'
---

12ddbc2037b16496dfb9d91c4f7091850146fcde