Correct merge issues in the last merge from master
authorKai Krueger <kakrueger@gmail.com>
Sat, 24 Apr 2010 12:14:54 +0000 (13:14 +0100)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 24 Apr 2010 12:33:12 +0000 (12:33 +0000)
commite4cb614e59057e6ea6d805eee1e4b258fb4e6dcf
tree51cabf3802a4175119bfe4f07d0850643fdf1a88
parent19c5f8aeaab18f314be9bacdc03e83670ca40609
Correct merge issues in the last merge from master
app/controllers/user_controller.rb