From: Tom-Oliver Heidel <redacted>
Date: Wed, 2 Sep 2020 21:03:40 +0000 (+0200)
Subject: Merge branch 'FliegendeWurst-3sat-zdf-merger-bugfix-feature'
X-Git-Tag: 2021.01.07~214
X-Git-Url: https://jfr.im/git/yt-dlp.git/commitdiff_plain/4cd6add62b54721eeb3bf76bd9c0b4d676dc4d68

Merge branch 'FliegendeWurst-3sat-zdf-merger-bugfix-feature'
---

4cd6add62b54721eeb3bf76bd9c0b4d676dc4d68