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

Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
---