From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 5 May 2014 20:48:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~533
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/095dbe671880a9457960295425300e054feb6a1a?ds=inline;hp=--cc

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

095dbe671880a9457960295425300e054feb6a1a