From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 26 May 2014 20:24:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~529
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f1cbca788531e9eefe5fbbadd7ac0d218f6aa076?ds=inline

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

f1cbca788531e9eefe5fbbadd7ac0d218f6aa076