From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 14 May 2016 19:09:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'markus/master' into master
X-Git-Tag: v3.0.0~170^2~11
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/234b1b0293aff8fe8bd13df986805e7d1b39bca2?ds=inline

Merge remote-tracking branch 'markus/master' into master
---

234b1b0293aff8fe8bd13df986805e7d1b39bca2