]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 5 May 2014 20:48:28 +0000 (22:48 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 5 May 2014 20:48:28 +0000 (22:48 +0200)

Trivial merge