]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 18 Apr 2017 20:45:34 +0000 (22:45 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 18 Apr 2017 20:45:34 +0000 (22:45 +0200)

Trivial merge