From: Stéphane Jacob Date: Mon, 24 Oct 2011 22:26:25 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.4~59 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e93255ef54304c697ef7ac101247f23dc5f7b31f;p=platal.git Merge branch 'xorg/maint' into xorg/master --- e93255ef54304c697ef7ac101247f23dc5f7b31f