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

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

ce32d77a658afe254d792d3a9322a620dccddce9