]> git.openstreetmap.org Git - nominatim.git/commitdiff
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)
Conflicts:
settings/settings.php
utils/specialphrases.php
website/search.php


No differences found