]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'FiloSottille/supports'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
Conflicts:
youtube-dl

1  2 
youtube_dl/InfoExtractors.py
youtube_dl/__init__.py

Simple merge
Simple merge