From: Stéphane Jacob Date: Sat, 24 Mar 2012 09:59:03 +0000 (+0100) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.5~34 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cfceef1ef8148bef4f7d1319ceabe43096110332;p=platal.git Merge branch 'xorg/maint' into xorg/master --- cfceef1ef8148bef4f7d1319ceabe43096110332