Merge 16355:16480 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 13 Jul 2009 23:28:02 +0000 (23:28 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 13 Jul 2009 23:28:02 +0000 (23:28 +0000)
1  2 
app/views/layouts/site.html.erb
config/locales/en.yml
config/locales/sl.yml
config/locales/vi.yml
config/routes.rb

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge