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)
1  2 
config/locales/en.yml

Simple merge