From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 23 Apr 2014 19:46:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~536
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ed65ad2f5abc5915c6b6ce4e8fdb876979cf151b

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

ed65ad2f5abc5915c6b6ce4e8fdb876979cf151b