]> git.openstreetmap.org Git - nominatim.git/commit
Merge branch 'master' of http://github.com/twain47/Nominatim
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 8 Oct 2012 05:43:37 +0000 (07:43 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 8 Oct 2012 05:43:37 +0000 (07:43 +0200)
commit03d6c48ef1bbc4ccd057125db6df015c0f8e53f0
treec840f1bc6de561f85fb067e69625d01c0cd0ac07
parent9c0ca064b833ad39eac8ffc2447331d732d1a7d0
parent491bc8c339800835c06571cbde9fb87b9d662baf
Merge branch 'master' of http://github.com/twain47/Nominatim

Conflicts:
settings/settings.php
utils/specialphrases.php
website/search.php
settings/settings.php
utils/setup.php
utils/specialphrases.php
website/search.php