From: Stéphane Jacob Date: Sat, 19 Nov 2011 14:29:45 +0000 (+0100) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.5~94 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=10a54c4e0ccd0972a2364055982d900c04cfd820;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 10a54c4e0ccd0972a2364055982d900c04cfd820