From: Stéphane Jacob Date: Tue, 13 Sep 2011 17:59:10 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~167 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=959221f7482b51bb1b3f03d86aeabc0bd246205a;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 959221f7482b51bb1b3f03d86aeabc0bd246205a