Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:17 +0000 (22:50 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:17 +0000 (22:50 +0100)
Conflicts:
config/locales/is.yml

1  2 
config/environment.rb
config/locales/is.yml

Simple merge
Simple merge