danielvincent 8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: config/routes.rb		2010-09-22 16:09:25 -07:00
..
edit.html.haml	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-22 16:09:25 -07:00