Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:43 +0000 (17:16 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:43 +0000 (17:16 +0100)
1  2 
app/controllers/user_controller.rb

Simple merge