From: Marek Marecki <triviuss@gmail.com>
Date: Fri, 24 May 2013 20:09:34 +0000 (+0200)
Subject: Merge branch 'streams'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e7159f91999c6487f18f3962920d8940d2d7eab0;p=diaspy.git

Merge branch 'streams'
---

e7159f91999c6487f18f3962920d8940d2d7eab0