From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 18 May 2014 19:42:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~530
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6b1f2cb2bc9771f2c65ff3f44855e6bfdf778d90?hp=--cc

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

6b1f2cb2bc9771f2c65ff3f44855e6bfdf778d90