Merge remote-tracking branch 'origin/manage-ui' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 29 Mar 2011 06:33:14 +0000 (01:33 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 29 Mar 2011 06:33:14 +0000 (01:33 -0500)
commitf7c0bc7b0c55e5e011e2c5dddb72ba2d2ff0ea52
tree4cdbc8e4bb4d727ec7f99090c9feab1241c40129
parent54bba58634679566acab38a2e52746d0cc1980db
parent720fe6ba8462ec55ffd9c51a4d4b28a2b2820df1
Merge remote-tracking branch 'origin/manage-ui' into next
app/controllers/users_controller.rb
config/routes.rb