From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 Sep 2016 20:44:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~422
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/91395fb9ab8e5ce969c9cd894454948423b9c0fe?hp=--cc

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

91395fb9ab8e5ce969c9cd894454948423b9c0fe