From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 14 Dec 2012 21:14:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~652
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/a7069753e81844dee38e440545bd21e93a6fbd6b

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

a7069753e81844dee38e440545bd21e93a6fbd6b