From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 20:22:43 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6405
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64f373dc598e9c672e1575622f2fc76c29655b8d?hp=64f373dc598e9c672e1575622f2fc76c29655b8d

Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
---