From: Philipp Hagemeister Date: Fri, 12 Dec 2014 16:12:25 +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=34bc0ae667d8632e5bc760884441d84f0a0a0b80 Merge branch 'master' of github.com:rg3/youtube-dl --- 34bc0ae667d8632e5bc760884441d84f0a0a0b80