From: Stéphane Jacob Date: Sat, 1 Oct 2011 13:54:02 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~112 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=07d0a10adbc2578f9b85875e551a03b99d3650e8;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 07d0a10adbc2578f9b85875e551a03b99d3650e8