From: Stéphane Jacob Date: Tue, 28 Jun 2011 21:51:17 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.3~54 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cbdcd130c8e5189a62587da35f37ea51eddf64b5;p=platal.git Merge branch 'xorg/maint' into xorg/master --- cbdcd130c8e5189a62587da35f37ea51eddf64b5