Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 20:22:43 +0000 (21:22 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 20:22:43 +0000 (21:22 +0100)
commit64f373dc598e9c672e1575622f2fc76c29655b8d
treeb277ef9cfe32130ed8601109075225f85f748d8a
parentc6609cce243bd2597b11fd8d57e57f8100ad65a1
parent2e43a275de10e162d605df71e3e0f16ba596ad25
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
app/controllers/user_controller.rb
app/views/user/new.html.erb
app/views/user/terms.html.erb
config/locales/en.yml
db/migrate/053_add_open_id_authentication_tables.rb
public/stylesheets/common.css