From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 7 Apr 2013 16:00:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~625
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/356724fb8b8d34ba92b5161dec91e7afb18ab99e

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

356724fb8b8d34ba92b5161dec91e7afb18ab99e