Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 23:30:43 +0000 (00:30 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 23:30:43 +0000 (00:30 +0100)
commit362f237e91541b7cef44629432ae500f4b0518f4
treedc79fc3649cdd8ff8a256616da37e3e810ed61e8
parent473dbfeede4bf326a43d02b8d50504bc9f654537
parentfe8a330fd6bdc1ee72758a9f40c90db7653ea28d
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/controllers/user_controller.rb
config/locales/en.yml
config/locales/is.yml