]> git.openstreetmap.org Git - nominatim.git/commit
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)
commit9c6d30ca956849bab8db239627dfdf4f9eeec6bb
tree4d3909f1bcb1866f07d30f24603dbdc1f39660c0
parenta446ea5ffc2e3c559d93f3c4f242ff7a579f0860
parent2cc0fa341bf8a576422ee022e1a4cba842627621
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/Geocode.php
lib/Geocode.php
sql/functions.sql