]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 2 Mar 2014 16:53:45 +0000 (17:53 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 2 Mar 2014 16:53:45 +0000 (17:53 +0100)
1  2 
lib/Geocode.php
utils/setup.php

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