From: Stéphane Jacob Date: Tue, 12 Jun 2012 18:22:51 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.6~36 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5f9ad38e8805cd275f2943494b8b692601a39c9c;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 5f9ad38e8805cd275f2943494b8b692601a39c9c