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)
commite657cff464b6db8384b56236ad9491223a22b1e2
treefa5c09fe8113835019dcb36496693e6e52b565e4
parent7f588e27aa6f02418709053c4c223a4f8f5e5027
parent2ec4555edfc25217c9d45ba40fa3414d929bc24f
Merge 16070:16110 from trunk.
config/locales/en.yml
config/routes.rb