danielvincent 3e5cecd532 Merge branch 'master' into group-top ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-08-02 16:09:13 -07:00
..
application.html.haml	Merge branch 'master' into group-top	2010-08-02 16:09:13 -07:00
session_wall.html.haml	user name is bigger	2010-07-23 22:35:12 -07:00