From: Moritz Kiefer <moritz.kiefer@gmail.com>
Date: Fri, 3 May 2013 08:23:12 +0000 (+0200)
Subject: Merge branch 'streams' of git://github.com/marekjm/diaspora-api into streams
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b920adf05c4a50033461f180bea8ea609910b46e;p=diaspy.git

Merge branch 'streams' of git://github.com/marekjm/diaspora-api into streams
---

b920adf05c4a50033461f180bea8ea609910b46e