Merge oauth branch at r17138 to trunk.
[rails.git] / app / views / user / index.html.erb