Merging 17846:17904 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
commit59102ea017825ceafdfe603cc43f9dd45e5c0ab6
tree2363a11ea6f914c2a361dde5671e5d50c4faa786
parent1e3b3c1f10213c48a40083e8bbca1429d9f819d6
parent1db1f0497447484c5555a3104152dcf3cf25c17b
Merging 17846:17904 from trunk.
config/locales/en.yml