From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 11:14:56 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6286
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/832b96b75ac05177e6baad7b414066ccfd7cfa51?hp=832b96b75ac05177e6baad7b414066ccfd7cfa51

Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
---