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)
commit735493837b036f5609f42a363c7f58f04525194c
tree8a3b64e19dab1f5694bfe11977bad6903bf3757d
parente4cb614e59057e6ea6d805eee1e4b258fb4e6dcf
parenta97ae09d2acc136b24f7f1794b4fba1159cee246
Merge branch 'master' into openID
config/locales/en.yml