From: Stéphane Jacob Date: Sun, 26 May 2013 14:26:16 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.9~29 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c609c97819458439748d095c0e3f9a6157840c3f;p=platal.git Merge branch 'xorg/maint' into xorg/master --- c609c97819458439748d095c0e3f9a6157840c3f