From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 1 May 2014 13:39:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~535
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/45383ee291e4b28dd249691d6e14f1b49fdd121a

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

45383ee291e4b28dd249691d6e14f1b49fdd121a