]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 3 Sep 2014 19:10:14 +0000 (21:10 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 3 Sep 2014 19:10:14 +0000 (21:10 +0200)
1  2 
lib/Geocode.php
sql/functions.sql

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