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
..
application.html.haml	Merge branch 'master' into getting-started	2010-10-26 16:50:57 -07:00
session_wall.html.haml	Add or later to license notice	2010-10-07 16:25:34 -07:00