From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Apr 2010 23:41:03 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~7012
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d36fab2913d10bef4eae2cee7c34875f20311af9?hp=d36fab2913d10bef4eae2cee7c34875f20311af9

Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
---