From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 11 Feb 2015 21:34:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~481
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a1a03a9b7965edf4f0dbbd6ac770dbe60190cbcb

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

a1a03a9b7965edf4f0dbbd6ac770dbe60190cbcb