Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:28:07 +0000 (22:28 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:28:07 +0000 (22:28 +0100)
commitf85681c5cee9406aacc1745a3fb3bd0331d3c0e4
treec6c0e7b1ab8cb7d59061b6c914854f7964e3ca1d
parent684aad13df709cb3e606be85dc29fcfc15341158
parent1eba0609296c8208fd69062a189371c05ebce11e
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/controllers/user_controller.rb
app/models/user.rb
config/environment.rb
config/locales/en.yml
public/stylesheets/common.css
test/fixtures/users.yml