Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sat, 23 Oct 2010 11:00:40 +0000 (12:00 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 23 Oct 2010 11:00:40 +0000 (12:00 +0100)
1  2 
config/locales/is.yml

Simple merge