]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 13 Oct 2013 17:49:08 +0000 (19:49 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 13 Oct 2013 17:49:08 +0000 (19:49 +0200)
commit09bde0baf96af07d5873e952f604fe4e2409e455
tree4cba6226bd059e4cd5d5f4cc169d44ece7a6dddb
parent4e41d336fce805e6c5dca2c519939070006ec033
parent8675a2607a289ad1a027422730bc65982fe5221f
Merge remote-tracking branch 'upstream/master'

Conflicts:
utils/update.php
sql/tables.sql
utils/setup.php
utils/update.php