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