From: Stéphane Jacob Date: Thu, 22 Sep 2011 07:43:00 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~140 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1ea2d001c2511d30bae13fe3aed0e698919380a8;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 1ea2d001c2511d30bae13fe3aed0e698919380a8