From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Sep 2014 18:43:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~516
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5d160ec514af97af2f430bbe9b02360ae4f0767c

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

5d160ec514af97af2f430bbe9b02360ae4f0767c