From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 Sep 2016 19:51:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into cmake-port
X-Git-Tag: deploy~424
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/dba5b2f86e3b91eade86a851932004a56b34134e?ds=inline;hp=dba5b2f86e3b91eade86a851932004a56b34134e

Merge remote-tracking branch 'upstream/master' into cmake-port
---