From: Raphaël Barrois <raphael.barrois@polyconseil.fr>
Date: Thu, 19 Dec 2013 18:59:48 +0000 (+0100)
Subject: Merge branch 'xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.11~15
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=26dfc151be9647f572aa693e023670b670e61885;p=platal.git

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

26dfc151be9647f572aa693e023670b670e61885