]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 30 Apr 2014 22:11:21 +0000 (00:11 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 30 Apr 2014 22:11:21 +0000 (00:11 +0200)
Conflicts:
lib/Geocode.php

1  2 
lib/Geocode.php
sql/functions.sql

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