From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 01:03:00 +0000 (+0100)
Subject: [options] PEP8 and simpler --merge-output-format handling (#4673)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=bd1a281ede1548ae0f0c74360eb518751c2a4526;hp=bd1a281ede1548ae0f0c74360eb518751c2a4526;p=youtube-dl

[options] PEP8 and simpler --merge-output-format handling (#4673)
---