From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 9 Mar 2014 19:58:50 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.13~43
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=768bcf433d125efdddeae47a055d0b4985529b88

Merge branch 'xorg/maint'
---

768bcf433d125efdddeae47a055d0b4985529b88