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

Simple merge