From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 6 Mar 2015 20:01:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~472
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/d5af98b63b3c812974dda6a554e0bf0aa59b96c0

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

d5af98b63b3c812974dda6a554e0bf0aa59b96c0