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)
commit9b10cbccb6ab258d6cecc1f8ba32c4ee1781c92f
treec6334f590d66730bff19d812d8fe42853adc782e
parentb917a0eba07184571ea62bb7b735eb48d7c04634
parent407ba399da7508fdad9924875153525245de1dc7
Merge branch 'master' into openid

Conflicts:
config/locales/is.yml
config/environment.rb
config/locales/is.yml