diaspora/diaspora — pull request #4585 by Raven24 (2013-11-10 20:41:55+00:00)
Title: Conversations rewrite #2

this is the continuation of my work in #4558

Ignore the first commit, that's still the sinatra-related stuff. I will history-edit the branch once I'm done...