From: João Pedro Athayde Marcondes de André (JP) Date: Fri, 4 Feb 2011 21:52:43 +0000 (+0100) Subject: Merge branch 'xorg/master' of /home/git/platal into xorg/master X-Git-Tag: xorg/1.1.0~155 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f53d69bbe83e6a9f60bd20411d3b71a394776772;p=platal.git Merge branch 'xorg/master' of /home/git/platal into xorg/master --- f53d69bbe83e6a9f60bd20411d3b71a394776772