]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 17:09:17 +0000 (19:09 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 17:09:17 +0000 (19:09 +0200)
commit0213643ebcba068561691bfbe366fed075d0d3d1
treee7ff020cbe34eec7fc8fad91cbe3e483d4d58079
parent6095a92a4ae80c3bad5c61ca87a747ab888cd689
parent9fd75fd7ce3040c0f376a2fc5411de2b267af8b7
Merge remote-tracking branch 'upstream/master'

Conflicts:
website/search.php
lib/lib.php
sql/functions.sql
utils/setup.php
utils/update.php
website/reverse.php