From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 1 Jun 2014 19:33:13 +0000 (+0200)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.13~15
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=728b73cc1ba81ac5a2611ca804ac7feb0317d459;hp=728b73cc1ba81ac5a2611ca804ac7feb0317d459;p=platal.git

Merge branch 'xorg/maint'
---