From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 16 Mar 2016 18:45:18 +0000 (+0100)
Subject: Merge branch 'cmake-port' into master
X-Git-Tag: v3.0.0~197
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6fc32d9645f98ec39c8773d6bf01cc2f6d4969de

Merge branch 'cmake-port' into master

Conflicts:
	CMakeLists.txt
	lib/init.php
	settings/settings.php
---

6fc32d9645f98ec39c8773d6bf01cc2f6d4969de