From: Tom Hughes <tom@compton.nu>
Date: Sat, 1 Dec 2012 18:22:30 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~6160^2~66
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/78f608b114c05f1147936a57b930831e28000c1a?hp=78f608b114c05f1147936a57b930831e28000c1a

Merge branch 'master' into notes

Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
---