]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 10 Oct 2016 20:42:43 +0000 (22:42 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 10 Oct 2016 20:42:43 +0000 (22:42 +0200)

Trivial merge