From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 2 Mar 2014 16:53:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~549
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/aade8c75cb6036c85f4df36c810fbbcc07f43907

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

aade8c75cb6036c85f4df36c810fbbcc07f43907