From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 22 Jan 2016 22:34:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~426
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/521d6294993f8d8d46d93d514c08556d0c924786

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

521d6294993f8d8d46d93d514c08556d0c924786