]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 18:16:07 +0000 (20:16 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 18:16:07 +0000 (20:16 +0200)
commitc141923971ba5473c8ae1e86de2fe702f6f8918e
tree54c4be06e664d04fc154a14b728c0b3e2278d533
parent2956ea4019bc7272abb335995cb1892fbcda20ef
parent27e6a24718e7d778b6b69df78cf5558aa9917f56
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/Geocode.php
lib/Geocode.php