Merge branch 'streams'
authorMarek Marecki <triviuss@gmail.com>
Wed, 12 Jun 2013 16:52:02 +0000 (18:52 +0200)
committerMarek Marecki <triviuss@gmail.com>
Wed, 12 Jun 2013 16:52:02 +0000 (18:52 +0200)

Trivial merge