From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 8 Oct 2014 18:36:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~510
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8564b76add152949d0493f8d15c5049f154118eb

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

8564b76add152949d0493f8d15c5049f154118eb