Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:49:10 +0000 (12:49 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:49:10 +0000 (12:49 +0100)
commitdd7ef37ec023646120358a0a6a7959a392b79f1c
tree2599adf87696bce8024421e3d07d54ca8f22b8ec
parent03fb042591bf60cd74aa277ee3de98f02d8486d3
parent6669253f9cec816fe42a195fe36e08af503a82c9
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
config/locales/en.yml
app/controllers/user_controller.rb
app/views/user/account.html.erb
app/views/user/terms.html.erb
config/locales/en.yml
config/locales/is.yml