Merge branch 'master' into openid

author Tom Hughes <tom@compton.nu>

Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)

committer Tom Hughes <tom@compton.nu>

Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
author Tom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
committer Tom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
diff --cc app/models/user.rb
Simple merge
diff --cc config/locales/en.yml
Simple merge
diff --cc config/locales/is.yml
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
		1	2
app/models/user.rb	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/is.yml	patch \|	diff1 \|	diff2 \|	blob \| history