From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 2 Jul 2010 08:30:53 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~369
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=bbc7476ed266ed900cc53d2a6623bb05eba64b47;p=platal.git

Merge branch 'platal-1.0.0'
---

bbc7476ed266ed900cc53d2a6623bb05eba64b47