From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 16 Dec 2012 15:25:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~649
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/fbaca0c19e66dd8a5383104ca65c63b4b72c5309

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

fbaca0c19e66dd8a5383104ca65c63b4b72c5309