]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
1  2 
youtube_dl/FileDownloader.py
youtube_dl/extractor/cinemassacre.py

Simple merge
Simple merge