From: Marek Marecki <triviuss@gmail.com>
Date: Fri, 3 May 2013 19:21:22 +0000 (+0200)
Subject: Merge branch 'streams' into people
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9290a027975b3c716e255722ebf554c39e9d6bf;p=diaspy.git

Merge branch 'streams' into people
---

d9290a027975b3c716e255722ebf554c39e9d6bf