Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 23:41:03 +0000 (00:41 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 23:41:03 +0000 (00:41 +0100)
commitd36fab2913d10bef4eae2cee7c34875f20311af9
tree0dcd815fd354136f4712cf5acc0cdb22f39faf50
parentbbf30e76e4bfcd70e62fc84ecd32c5e494506e9e
parent16030e03817e2df25e087c966da33edc78d7d23e
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
config/locales/en.yml
app/controllers/user_controller.rb
app/models/user.rb
app/views/user/account.html.erb
app/views/user/login.html.erb
app/views/user/new.html.erb
config/environment.rb
config/locales/en.yml