From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 17 Jun 2013 07:53:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.9~27
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=bb0d070949034c80c3ebd82d927e40663beb4c51;p=platal.git

Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
---

bb0d070949034c80c3ebd82d927e40663beb4c51