From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Fri, 3 Jan 2014 17:44:20 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.12~61
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6e1128e02f7568a692d548d8bc43cad6bde38efe;p=platal.git

Merge branch 'xorg/maint'
---

6e1128e02f7568a692d548d8bc43cad6bde38efe