]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 4 Dec 2013 07:14:06 +0000 (08:14 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 4 Dec 2013 07:14:06 +0000 (08:14 +0100)
Conflicts:
lib/Geocode.php
utils/update.php


No differences found