]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'holomorph/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 2 Oct 2013 06:23:53 +0000 (08:23 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 2 Oct 2013 06:23:53 +0000 (08:23 +0200)
1  2 
youtube_dl/__init__.py
youtube_dl/extractor/youtube.py

Simple merge
Simple merge