From: Philipp Hagemeister Date: Sat, 13 Dec 2014 22:05:28 +0000 (+0100) Subject: Merge branch 'master' of github.com:rg3/youtube-dl X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=74f91c4af7640a62dfe610fae80e92b0a40593c2 Merge branch 'master' of github.com:rg3/youtube-dl --- 74f91c4af7640a62dfe610fae80e92b0a40593c2