]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 15 Jan 2017 20:39:27 +0000 (21:39 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 15 Jan 2017 20:39:27 +0000 (21:39 +0100)

Trivial merge