From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 3 Nov 2013 17:51:27 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.10~19
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=faea3db3053e54bbf91cedba3f048396aa725af1;p=platal.git

Merge branch 'xorg/maint'
---

faea3db3053e54bbf91cedba3f048396aa725af1