From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 21 Sep 2014 20:47:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~514
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a8d6db0b2a3b641e2435aa2ccae63d5caa4bcb7f

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

a8d6db0b2a3b641e2435aa2ccae63d5caa4bcb7f