From: Philipp Hagemeister Date: Fri, 22 Nov 2013 21:46:57 +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=081640940eaac8a4cc29c3a277df3ab05ee45968 Merge branch 'master' of github.com:rg3/youtube-dl --- 081640940eaac8a4cc29c3a277df3ab05ee45968