Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
1  2 
app/models/user.rb
config/locales/en.yml
config/locales/is.yml

Simple merge
Simple merge
Simple merge