From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 25 Jan 2013 18:56:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~638
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/5502c223756ed755edae9670497f1456e528d3f0

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

5502c223756ed755edae9670497f1456e528d3f0