From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 1 May 2014 07:26:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~531
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/70f0d6ba8bc0e8c4115155b27a36e8a9a037d727

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

70f0d6ba8bc0e8c4115155b27a36e8a9a037d727