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)
1  2 
config/environment.rb
config/locales/en.yml

Simple merge
Simple merge