Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 09:59:29 +0000 (10:59 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 09:59:29 +0000 (10:59 +0100)
commite09b187cae178c000a683635d408cab72dc3d35b
tree71f7ec15afd6a7ce7bd0885d2768bdb0e784e68f
parentc1b65d11fd71d3801f4f5e42a3c40dc872a766f9
parent86596c0d1fb640f9a87680880d07606678e033fe
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/controllers/user_controller.rb
config/locales/en.yml
public/stylesheets/common.css