Merge 17944:17988 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 5 Oct 2009 20:25:45 +0000 (20:25 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 5 Oct 2009 20:25:45 +0000 (20:25 +0000)
commit7de5220090d01722d8ea06679493355eefd4636c
treeb4796d0b695352585e271769f419dc0a28925370
parent17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb
parent0721a135b6dadc6e9355cbaf68c57e55c4271da0
Merge 17944:17988 from trunk.
config/locales/en.yml