From: Florent Bruneau Date: Sun, 19 Jun 2011 15:27:21 +0000 (+0200) Subject: Merge remote branch 'origin/master' into xorg/f/surveys X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=refs%2Fheads%2Fxorg%2Ff%2Fsurveys;p=platal.git Merge remote branch 'origin/master' into xorg/f/surveys --- c8254ce32eb6f99075f968a8a8e6a0a63bac6bef