danielvincent 762cbcb0f2 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/comments/_comment.html.haml app/views/layouts/application.html.haml		2010-06-28 12:09:35 -07:00
..
application.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 12:09:35 -07:00