Merge remote branch 'upstream/next' into ui
authordgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 17:41:58 +0000 (12:41 -0500)
committerdgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 17:41:58 +0000 (12:41 -0500)
commit26e32dc94e5c38ad3fb1a80e7d7815ac29ec1ba8
treeea169ba5fc3ffbb9511cb8432a8ee3498b2ca197
parentc38fa44807723c2df5c3495d7359e0242d20ab7e
parentfcc27ba2cfcf869b8175481767dbee1e8a5436d2
Merge remote branch 'upstream/next' into ui
app/controllers/users_controller.rb