From: Tom Hughes <tom@compton.nu>
Date: Sun, 17 Oct 2010 09:59:29 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~7348
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e09b187cae178c000a683635d408cab72dc3d35b?hp=e09b187cae178c000a683635d408cab72dc3d35b

Merge branch 'master' into openid

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