]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'naglis/wistia'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
1  2 
youtube_dl/extractor/generic.py

Simple merge