From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 5 Nov 2010 22:15:23 +0000 (+0100)
Subject: Merge remote branch 'origin/platal-1.0.1'
X-Git-Tag: xorg/1.1.0~276
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=63331d9bdeca8d8d6b0cabd028705f69c7ba4440;p=platal.git

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

63331d9bdeca8d8d6b0cabd028705f69c7ba4440