danielvincent 0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-06-29 17:30:29 -07:00
..
_publisher.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -07:00