From: Stéphane Jacob Date: Wed, 4 May 2011 14:58:33 +0000 (+0200) Subject: Merge branch 'xorg/master' into xorg/f/geocoding X-Git-Tag: xorg/1.1.2~62^2~31 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cb6e7db980fcc5fcdd2dad5aa645cfdf98057cd4;p=platal.git Merge branch 'xorg/master' into xorg/f/geocoding --- cb6e7db980fcc5fcdd2dad5aa645cfdf98057cd4