From: Philipp Hagemeister Date: Fri, 17 Jan 2014 13:48:15 +0000 (+0100) Subject: Merge branch 'master' of github.com:rg3/youtube-dl X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1;p=youtube-dl.git Merge branch 'master' of github.com:rg3/youtube-dl --- e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1