Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Fri, 24 Sep 2010 08:35:36 +0000 (09:35 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 24 Sep 2010 08:35:36 +0000 (09:35 +0100)
commitf70feedc6517b824c4201584d6298fd5790d85ba
treef5443ff6fa7b618e4dc95500218ea62f58fd0bfb
parent945d60ea5a52d0c1d41cc63456bd6f60e547e79e
parent2150d1021e52e3441bad3bbd1a03ba68f89c7da6
Merge branch 'master' into openid
app/controllers/user_controller.rb
config/locales/en.yml
config/locales/is.yml