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

Simple merge