From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 23 Mar 2015 21:01:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~472
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/de978c9987ddbb6595029b23b5dfd2823fc4ea3f

Merge remote-tracking branch 'upstream/master'
---

de978c9987ddbb6595029b23b5dfd2823fc4ea3f