Merge branch 'master' into openID
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 2 May 2010 08:57:50 +0000 (08:57 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 2 May 2010 08:57:50 +0000 (08:57 +0000)
commit441b92c3c33cf79c2bac977cf0b3cf2c3e7e010e
tree2b3d60167a07e6a92beec99fc5853368042047a4
parent900fdde6646f572912f4422bfee10131d95b7a73
parent4d1fa7adfbd169187b6e872146925fc14535a11c
Merge branch 'master' into openID
config/environment.rb
config/locales/en.yml