Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Thu, 10 Feb 2011 14:10:19 +0000 (14:10 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 10 Feb 2011 14:10:19 +0000 (14:10 +0000)
commit11aff90f63d79406e9efa1343c965a19dcf5dbba
treeaf97db76f0becad7f8c2efb1cce190bf0b008050
parente09b187cae178c000a683635d408cab72dc3d35b
parente37a9ec0b52ead11543660ca45fee33c7f7bb1d7
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
public/stylesheets/common.css
app/controllers/user_controller.rb
app/models/user.rb
app/views/user/account.html.erb
app/views/user/login.html.erb
config/locales/en.yml
config/locales/is.yml
public/stylesheets/common.css
test/test_helper.rb