From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 23 Mar 2014 10:44:39 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.13~39
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=84440b3e140b49e052d90d07631fe83d63e5e04a

Merge branch 'xorg/maint'
---

84440b3e140b49e052d90d07631fe83d63e5e04a