merge r17141:17256 from trunk
[rails.git] / app / views / layouts /
drwxr-xr-x   ..
-rw-r--r-- 7464 site.html.erb
-rw-r--r-- 27 site.rss.builder