From: Stéphane Jacob Date: Sat, 9 Apr 2011 15:31:19 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~111 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b65169f172b0b06c7731cfc67aaea15081fc0d31;p=platal.git Merge branch 'xorg/maint' into xorg/master --- b65169f172b0b06c7731cfc67aaea15081fc0d31