Merge remote-tracking branch 'origin/fixes-patcito'
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Aug 2011 23:34:01 +0000 (18:34 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Aug 2011 23:34:01 +0000 (18:34 -0500)
commit50af1a007a6993704a78261858f194c392d95946
tree72e0a23980f070d0925d9c5d47d23fa2f86c32e1
parente0b67f7725bb39f4e7b2625b7e575b2b74e78367
parent5696577da6ff9ca01c05de00661acc9ac1148f49
Merge remote-tracking branch 'origin/fixes-patcito'
app/controllers/users_controller.rb