From: Stéphane Jacob Date: Sun, 3 Jun 2012 10:41:04 +0000 (+0200) Subject: Merge branch 'xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.6~45 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=08b5c28f7adf245d5a262add9c31209f5d188ec7;p=platal.git Merge branch 'xorg/maint' into xorg/master --- 08b5c28f7adf245d5a262add9c31209f5d188ec7