Merge changes from trunk 7673:8632.
[rails.git] / app / views / user / index.rhtml