Merge 14394:14533 from trunk.
[rails.git] / app / views / user / index.rhtml