From: Philipp Hagemeister Date: Thu, 8 Dec 2011 19:39:22 +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=a05d2a0c05b553bf2f5dec78aade0bf4733e9852;p=youtube-dl.git Merge branch 'master' of github.com:rg3/youtube-dl --- a05d2a0c05b553bf2f5dec78aade0bf4733e9852