danielvincent 385e1673ab Merge branch 'master' into getting-started ... Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml		2010-10-26 16:50:57 -07:00
..
getting_started	Merge branch 'master' into getting-started	2010-10-26 16:50:57 -07:00
edit.html.haml	settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update	2010-10-26 16:02:53 -07:00