From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 8 Oct 2012 05:43:37 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/twain47/Nominatim
X-Git-Tag: deploy~673
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/03d6c48ef1bbc4ccd057125db6df015c0f8e53f0?ds=sidebyside;hp=03d6c48ef1bbc4ccd057125db6df015c0f8e53f0

Merge branch 'master' of http://github.com/twain47/Nominatim

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