From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 7 Feb 2014 22:42:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~557
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/616d96bf9cf48b1cc61c902d79fa85fdc977970a?ds=inline

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

616d96bf9cf48b1cc61c902d79fa85fdc977970a