From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 5 Feb 2014 19:19:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~560
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/1f2ee8ed77695c2e475508f961db5b37f8d83bd6?hp=1f2ee8ed77695c2e475508f961db5b37f8d83bd6

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/init-website.php
---