danielvincent e159b8f7f4 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/friends/show.html.haml		2010-06-29 20:56:44 -07:00
..
application.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 20:56:44 -07:00
session_wall.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00