From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 13 Oct 2012 07:19:42 +0000 (+0200)
Subject: Merge branch 'master' of github.com:twain47/Nominatim
X-Git-Tag: deploy~661
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7fba4ec99738cc69ee773e7f79418a9353029aaa

Merge branch 'master' of github.com:twain47/Nominatim

Conflicts:
	munin/nominatim_importlag
	utils/setup.php
---

7fba4ec99738cc69ee773e7f79418a9353029aaa