From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 23 Apr 2013 19:27:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~617
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/23848100b932bdc4d0426ceb6d80db832205c4e7

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

23848100b932bdc4d0426ceb6d80db832205c4e7