Tom Hughes dd7ef37ec0 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/terms.html.erb config/locales/en.yml		2010-09-06 12:49:10 +01:00
..
controllers	Merge branch 'master' into openid	2010-09-06 12:49:10 +01:00
helpers	Merge branch 'master' into openid	2010-07-28 21:39:46 +01:00
models	Merge branch 'master' into openid	2010-09-06 12:49:10 +01:00
views	Merge branch 'master' into openid	2010-09-06 12:49:10 +01:00