From: Stéphane Jacob Date: Sat, 2 Apr 2011 15:52:51 +0000 (+0200) Subject: Merge remote branch 'origin/xorg/maint' into xorg/master X-Git-Tag: xorg/1.1.1~132 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=97980d82cffb765e16502de2d1fb694d69631b25;p=platal.git Merge remote branch 'origin/xorg/maint' into xorg/master --- 97980d82cffb765e16502de2d1fb694d69631b25