Merge remote branch 'upstream/next' into ui
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Mon, 21 Mar 2011 19:49:49 +0000 (14:49 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Mon, 21 Mar 2011 19:49:49 +0000 (14:49 -0500)
commitcd6083fc3550fbca5758fa8d61d29d6d9b0fcf54
treeb2c91439831f76bb4e1fae2daae8d1d9e3b558b0
parent184b1cf77eafe32f898c3fab80522232346ac47d
parent54bba58634679566acab38a2e52746d0cc1980db
Merge remote branch 'upstream/next' into ui
app/controllers/users_controller.rb