From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Mon, 10 Mar 2014 17:59:32 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.13~41
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=dca40482d4839e7e365bd60a892a1e5de2d5d7a1

Merge branch 'xorg/maint'
---

dca40482d4839e7e365bd60a892a1e5de2d5d7a1