Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:18 +0000 (16:29 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:18 +0000 (16:29 +0100)
1  2 
config/locales/en.yml
config/locales/is.yml

Simple merge
Simple merge