From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 3 Sep 2014 19:10:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~520
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ededee63989ddcdf048833aef932bf02a08a1ab4?ds=inline

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

ededee63989ddcdf048833aef932bf02a08a1ab4