From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 12 Jun 2015 21:54:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~450
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b11461907f02b4f583e22ccdf90550f00f1f39b7

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

b11461907f02b4f583e22ccdf90550f00f1f39b7