From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Tue, 25 Mar 2014 22:54:04 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.13~38
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=feeee7a3e81817d8abf324020cc7fc0b9425f657

Merge branch 'xorg/maint' into xorg/master
---

feeee7a3e81817d8abf324020cc7fc0b9425f657