]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 12 Sep 2013 17:35:24 +0000 (19:35 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 12 Sep 2013 17:35:24 +0000 (19:35 +0200)
1  2 
lib/Geocode.php
lib/lib.php
settings/settings.php

diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
Simple merge