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.sass	Merge branch 'master' into group-top	2010-08-02 16:09:13 -07:00
sessions.sass	nevermind, nevermind	2010-06-29 23:47:39 -07:00
ui.sass	DG IZ album view page brush up	2010-07-28 15:33:27 -07:00