From: Stéphane Jacob Date: Mon, 6 Jun 2011 12:06:17 +0000 (+0200) Subject: Merge branch 'xorg/master' into xorg/f/surveys X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=86361a099429af6fa1910330067d6771cb76f839;p=platal.git Merge branch 'xorg/master' into xorg/f/surveys --- 86361a099429af6fa1910330067d6771cb76f839