From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 16 Nov 2013 00:47:49 +0000 (-0800)
Subject: Merge branch 'master' into redesign
X-Git-Tag: live~5738^2~53
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1?hp=2b4f8e92c969a5508b73ae7af45811a118fda6b1

Merge branch 'master' into redesign

Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
---