Merge 16070:16110 from trunk.
authorTom Hughes <tom@compton.nu>
Thu, 25 Jun 2009 16:45:26 +0000 (16:45 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 25 Jun 2009 16:45:26 +0000 (16:45 +0000)
1  2 
config/locales/en.yml
config/routes.rb

Simple merge
Simple merge