]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
Conflicts:
utils/specialphrases.php


No differences found