From: Stéphane Jacob Date: Mon, 16 May 2011 13:00:13 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.2~83 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e50f74d50fb29c50325120aec408611c9407c6d9;p=platal.git Merge branch 'xorg/maint' into xorg/master --- e50f74d50fb29c50325120aec408611c9407c6d9