Merge branch 'zip-stream'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 May 2018 10:34:53 +0000 (12:34 +0200)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 May 2018 10:34:53 +0000 (12:34 +0200)

Trivial merge