Merge 16110:16216 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 29 Jun 2009 16:50:34 +0000 (16:50 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 29 Jun 2009 16:50:34 +0000 (16:50 +0000)
commit6baccfaddd190d730b626204e9cf81c2504995bf
tree86740bb4a6dc9381addfaece89d2534590184417
parentc807e9ba66af36280597594a48767c8562a9451b
parent85f317b46e49ca20db53ad4465054e0fbe3fc88e
Merge 16110:16216 from trunk.
config/locales/en.yml
config/locales/is.yml
config/routes.rb