From: Philipp Hagemeister Date: Sat, 12 Apr 2014 15:15:16 +0000 (+0200) 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=66398056f17d0a9c04861a98b6e95d70ab08a353 Merge branch 'master' of github.com:rg3/youtube-dl --- 66398056f17d0a9c04861a98b6e95d70ab08a353