From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 9 Mar 2015 20:40:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~474
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1812c89c31b6e163a14144ae05fff34b97634367

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

1812c89c31b6e163a14144ae05fff34b97634367