From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 20 Jun 2013 19:09:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~602
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a46c739ffb1801c83a86b4776c70a3e9cb0440c6

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

a46c739ffb1801c83a86b4776c70a3e9cb0440c6