danielvincent 01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: public/stylesheets/sass/application.sass		2010-06-28 22:18:47 -07:00
..
application.sass	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00
sessions.sass	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00