From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 13 Sep 2013 18:51:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~580
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/fca59b8d115a699623d49a929609224c60de37ba?ds=inline;hp=--cc

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

fca59b8d115a699623d49a929609224c60de37ba