merge 19601:19888 of rails_port into the openID branch
authorKai Krueger <kakrueger@gmail.com>
Sat, 6 Feb 2010 13:13:52 +0000 (13:13 +0000)
committerKai Krueger <kakrueger@gmail.com>
Sat, 6 Feb 2010 13:13:52 +0000 (13:13 +0000)
commit17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4
tree7af172a61094323e3bb19e27f1b6073e4babf9ca
parent6ca7ab3c7e1d0e8a15becbbad4adfc03efda4ff1
parentba65dcc97a5082201e86d637c6e6828db68c8951
merge 19601:19888 of rails_port into the openID branch
config/locales/en.yml