Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 23:23:04 +0000 (00:23 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 23:23:04 +0000 (00:23 +0100)
commitc016bf6c153eb1c416b2104874bf2e44c2f55913
tree888867b14799af24b66f1cad56042d67f5a0a692
parentc246b916754b34a791a75cb96a0f621e473533ef
parentc5631ea8fb0fe268db608e3d3f2136e9c1913db2
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/controllers/user_controller.rb
config/locales/en.yml
test/integration/user_creation_test.rb