Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:18:44 +0000 (21:18 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:18:44 +0000 (21:18 +0100)
1  2 
app/controllers/user_controller.rb
config/locales/en.yml

Simple merge
Simple merge