Merging 17905:17944 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
commit17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb
tree3dbb89e29c2032b89c43fea11687359e31cbaf62
parent3429f016c2245bd538aaf277136bbf65e448b3a5
parentd0f228879741a8d35ae7d9e98d3fe3c9e227a1fa
Merging 17905:17944 from trunk.
config/locales/en.yml