Tom Hughes 64f373dc59 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/new.html.erb config/locales/en.yml public/stylesheets/common.css		2010-05-11 21:22:43 +01:00
..
controllers	Merge branch 'master' into openid	2010-05-11 21:22:43 +01:00
helpers	Rework the login method to make it a bit clearer	2010-05-10 14:21:28 +01:00
models	Merge branch 'master' into openid	2010-05-07 22:28:07 +01:00
views	Merge branch 'master' into openid	2010-05-11 21:22:43 +01:00