Merge pull request #1413 from tewe/master
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 13 Sep 2013 17:55:49 +0000 (19:55 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 13 Sep 2013 19:34:31 +0000 (21:34 +0200)
commit74ac9bdd82b8a625ea9782251258ab7da1463877
treea9f023d452361aa65cd5289a613f1da8eab9e0f4
parent94518f208799dde250f5fd8dd0ce77dd7ea05b1c
parentbfd5c93af9f9eee938c628f19c997f999f21c74e
Merge pull request #1413 from tewe/master

Add Ustream channel support
test/test_playlists.py
youtube_dl/extractor/__init__.py
youtube_dl/extractor/ustream.py