From: Marc Tobias Metten <mtmail@gmx.net>
Date: Fri, 4 Mar 2016 14:42:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.0.0~201^2~2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d3ff9600b5e345239f4dc1b5d1b7244f5a25d051?ds=sidebyside;hp=--cc

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

d3ff9600b5e345239f4dc1b5d1b7244f5a25d051