]> git.bitcoin.ninja Git - youtube-dl/commit
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)
commit7f36e396768722319b4036b845cd9a105b60bd5b
treecc91384b68fe52ce18a06dcc10331319f0b0de1a
parentebe3f89ea45dc74bbadab10acc27ebf91ddbb736
parent795cc5059a6f349f861e246269d6cced39b3a753
Merge remote-tracking branch 'FiloSottille/supports'

Conflicts:
youtube-dl
youtube_dl/InfoExtractors.py
youtube_dl/__init__.py