From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Mon, 3 Feb 2014 20:15:20 +0000 (+0100)
Subject: Merge branch 'xorg/maint'
X-Git-Tag: xorg/1.1.12~44
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=73317355964c4cd538157f8b281a1384b7e38e4d;p=platal.git

Merge branch 'xorg/maint'
---

73317355964c4cd538157f8b281a1384b7e38e4d