Merge remote-tracking branch 'origin/close-popup' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 9 Apr 2011 06:07:42 +0000 (01:07 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 9 Apr 2011 06:07:42 +0000 (01:07 -0500)
commit97c5b5d93fdb8e20223eec56697a549f409df9a8
tree2e993b1a6a6f320363f464635a2313ce4da7c731
parent624624da73f2c22e03283152e4e2f196f982b5c0
parenta8e524288fe1d6dc9db57532f060b420927ba2d5
Merge remote-tracking branch 'origin/close-popup' into next
app/controllers/users_controller.rb
config/routes.rb