Merge branch 'streams'
authorMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:09:34 +0000 (22:09 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:09:34 +0000 (22:09 +0200)

Trivial merge