Tom Hughes 11aff90f63 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb public/stylesheets/common.css		2011-02-10 14:10:19 +00:00
..
controllers	Merge branch 'master' into openid	2011-02-10 14:10:19 +00:00
helpers	Merge branch 'master' into openid	2011-02-10 14:10:19 +00:00
models	Merge branch 'master' into openid	2011-02-10 14:10:19 +00:00
views	Merge branch 'master' into openid	2011-02-10 14:10:19 +00:00