Merge branch 'master' into openID
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 20 Apr 2010 23:41:14 +0000 (23:41 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 20 Apr 2010 23:41:14 +0000 (23:41 +0000)
1  2 
config/locales/en.yml

Simple merge