]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 9 Apr 2013 21:25:08 +0000 (23:25 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 9 Apr 2013 21:25:08 +0000 (23:25 +0200)
commit9f880c367c4a9fd8a2950011eeba22c77ab0c914
treefe1665ee7b7d453ccf644663efd9fc784380fd56
parent356724fb8b8d34ba92b5161dec91e7afb18ab99e
parent23d303124e903e58e5c95890868de8c62304946f
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/indices.src.sql
sql/tables.sql
sql/indices.src.sql
sql/partition-tables.src.sql
sql/tables.sql
website/search.php