From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 28 Dec 2014 22:11:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~493
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f1c4615c32532cdb03845c017f660fa5c5a06331

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/specialphrases.php
---

f1c4615c32532cdb03845c017f660fa5c5a06331