danielvincent 67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml		2010-06-29 14:36:46 -07:00
..
application.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 14:36:46 -07:00
session_wall.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00