From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 10 May 2014 17:42:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~531
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/676f7c86705ae9d1ccdfdef6f6574cb491006e63

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

676f7c86705ae9d1ccdfdef6f6574cb491006e63