]> git.openstreetmap.org Git - nominatim.git/commit
Merge branch 'master' of github.com:twain47/Nominatim
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 13 Oct 2012 07:19:42 +0000 (09:19 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 13 Oct 2012 07:19:42 +0000 (09:19 +0200)
commit7fba4ec99738cc69ee773e7f79418a9353029aaa
treef51e5d11bc35c6c21ddce94eb92567cd72cf1d66
parent1bcc40b1e5e20006f32b3889e14d4867e8df84a2
parentd2a74c9bd95ce7ed4e9ad17a5d54bef2930b7669
Merge branch 'master' of github.com:twain47/Nominatim

Conflicts:
munin/nominatim_importlag
utils/setup.php
website/search.php