From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 10 Sep 2014 19:47:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~517
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7a11e17008efa632eac9fd65b8599814681cb03d

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

7a11e17008efa632eac9fd65b8599814681cb03d