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

author Brian Quinion <openstreetmap@brian.quinion.co.uk>

Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)

committer Brian Quinion <openstreetmap@brian.quinion.co.uk>

Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)
author Brian Quinion <openstreetmap@brian.quinion.co.uk>
Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)
committer Brian Quinion <openstreetmap@brian.quinion.co.uk>
Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)
diff --cc sql/functions.sql
Simple merge
diff --cc utils/setup.php
Simple merge
author	Brian Quinion <openstreetmap@brian.quinion.co.uk>
	Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)
committer	Brian Quinion <openstreetmap@brian.quinion.co.uk>
	Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)
		1	2
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history
utils/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history