From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 14 Jun 2013 16:22:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~605
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/27ea1bb42db0356a81eb9fadb5515f9abf2bb130?ds=inline

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

27ea1bb42db0356a81eb9fadb5515f9abf2bb130