From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 8 Feb 2016 19:42:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~432
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/21c590416854b1245866b96772fde61050c0e01a?ds=sidebyside

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

21c590416854b1245866b96772fde61050c0e01a