]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 11 Jan 2015 14:40:37 +0000 (15:40 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 11 Jan 2015 14:40:37 +0000 (15:40 +0100)
commitd6fa3ce8ff49fe56f24d10975e83c8b4b65e5f79
treebc2157dab6bda81bfcf80d03176429eb5ccc9268
parentf1c4615c32532cdb03845c017f660fa5c5a06331
parentf156da6b63e4a3e6a65ec49d2943b88255adb4c6
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/tiger_import_finish.sql
sql/functions.sql
sql/tiger_import_finish.sql
utils/setup.php