From: Tom Hughes <tom@compton.nu>
Date: Mon, 6 Sep 2010 11:49:10 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~7365
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd7ef37ec023646120358a0a6a7959a392b79f1c?hp=dd7ef37ec023646120358a0a6a7959a392b79f1c

Merge branch 'master' into openid

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