Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:14:56 +0000 (12:14 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:14:56 +0000 (12:14 +0100)
commit832b96b75ac05177e6baad7b414066ccfd7cfa51
treeef34eb315756663d8e588911e41914562c8ff3c1
parent9cb8311f02e1bd0e2188e3b1db623400aaf8da47
parent11b5fc0e95e589b0d301e4891c528e3d19171b40
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
test/fixtures/users.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
public/stylesheets/common.css
public/stylesheets/small.css
test/fixtures/users.yml
test/integration/user_blocks_test.rb