]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'rzhxeo/rtl_ntv'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 3 Oct 2013 22:59:11 +0000 (00:59 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 3 Oct 2013 22:59:11 +0000 (00:59 +0200)
1  2 
youtube_dl/extractor/rtlnow.py

Simple merge