From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 11 Apr 2015 17:45:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~468
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/dd7912ff55b68944070b0bb5e3649baff2584878

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

dd7912ff55b68944070b0bb5e3649baff2584878