From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 6 Jul 2014 19:05:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~528
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d6f4448ed33298e563c520fc654fe5d445ff7f57

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

d6f4448ed33298e563c520fc654fe5d445ff7f57