danielvincent 5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml		2010-06-27 10:32:23 -07:00
..
application.sass	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-27 10:32:23 -07:00