From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 24 Nov 2013 15:48:40 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.10~12
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b53b9de75a3240e36c52b42cd8334664040dc776;p=platal.git

Merge branch 'xorg/maint'
---

b53b9de75a3240e36c52b42cd8334664040dc776