]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 29 Aug 2015 10:16:33 +0000 (12:16 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 29 Aug 2015 10:16:33 +0000 (12:16 +0200)

Trivial merge