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)
commit9a32033209545a69d60cbd551e6bd975cda64341
tree4fbdd23a6e75499bb6233f22bde2984e386a2e82
parentd63f6058934b26043a32b70d42bd3ce59b975efa
parentff401e541b89850376e7491f98ec5f3c18057d9b
Merge 16216:16355 from trunk.
app/views/layouts/site.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/locales/is.yml
config/routes.rb