Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 5 Dec 2010 15:15:55 +0000 (15:15 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Dec 2010 15:15:55 +0000 (15:15 +0000)
commit0ea9f92be50a8763331a81d3c32a5f5a157265c6
treebaa1fc2e685030c80b1de7484d3d46e19233480c
parent58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a
parent42ef10ba80bf7ff13b4f9210e5fbf54538e0d52f
Merge branch 'master' into openid

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