From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Aug 2012 19:52:08 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~6355^2~106
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22?hp=0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22

Merge branch 'master' into openstreetbugs

Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
---