From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 23:30:43 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6961
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/362f237e91541b7cef44629432ae500f4b0518f4?hp=362f237e91541b7cef44629432ae500f4b0518f4

Merge branch 'master' into openid

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