Merge 16216:16355 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 5 Jul 2009 23:47:40 +0000 (23:47 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Jul 2009 23:47:40 +0000 (23:47 +0000)
1  2 
app/views/layouts/site.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/locales/is.yml
config/routes.rb

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge