From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 25 Mar 2015 21:32:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~471
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3ce0917874b55d8013d8bb37113e42dfb0c8b452

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

3ce0917874b55d8013d8bb37113e42dfb0c8b452