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)
commit9448eab143cd052e9ee48cabdf13a8525add1b2c
tree203821a6745fce85b4cd3e3b3cbc2d17b5bbe03e
parentd36fab2913d10bef4eae2cee7c34875f20311af9
parent7a8fe086cdbd6fddf2d842827bd7c2bb4ad439f6
Merge branch 'master' into openID
config/locales/en.yml