From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 28 Apr 2014 19:36:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~539
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a446ea5ffc2e3c559d93f3c4f242ff7a579f0860

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

a446ea5ffc2e3c559d93f3c4f242ff7a579f0860