Merge 16012:16110 from trunk.
authorTom Hughes <tom@compton.nu>
Thu, 25 Jun 2009 16:32:05 +0000 (16:32 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 25 Jun 2009 16:32:05 +0000 (16:32 +0000)
commit02628bed1e7b5c2656bc68076403467e92462b4f
tree6761022789742142814c8dbcb054177fb0a351af
parent37c85084e8faea1dbf9e5142a2913802aaa4ff20
parent2ec4555edfc25217c9d45ba40fa3414d929bc24f
Merge 16012:16110 from trunk.
config/locales/en.yml
config/locales/is.yml
config/routes.rb