Merge remote-tracking branch 'origin/popupfix' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 14 May 2011 00:34:00 +0000 (19:34 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 14 May 2011 00:34:00 +0000 (19:34 -0500)
commit5fa6be12b83b66678f964ff6051028692e299928
tree5af15e840e5a2e31d2a4300e7c43e1c14e0404dd
parent6791794131f190ec2e9285f289e13b88b14ff56c
parent72e268ef922e3c7403c955cd9c38fefa9155dea9
Merge remote-tracking branch 'origin/popupfix' into next
app/controllers/users_controller.rb