From: Tom Hughes <tom@compton.nu>
Date: Sat, 13 Oct 2012 14:55:34 +0000 (+0100)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5226^2~95
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/00375024263970a43ea7d39e3c65dfd0f32e8869?ds=sidebyside;hp=00375024263970a43ea7d39e3c65dfd0f32e8869

Merge branch 'master' into notes

Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
---