Philipp Hagemeister 24f5251cce Merge remote-tracking branch 'pulpe/teachertube' ...

Conflicts:
	youtube_dl/extractor/__init__.py

2014-06-07 15:20:12 +02:00

..

__init__.py

…

helper.py

…

parameters.json

…

test_age_restriction.py

…

test_all_urls.py

…

test_download.py

…

test_execution.py

…

test_InfoExtractor.py

…

test_playlists.py

[TeacherTubeIE] Add extractor for teachertube.com videos + classrooms (fixes #3046)

2014-06-06 11:21:59 +02:00

test_subtitles.py

…

test_unicode_literals.py

…

test_utils.py

…

test_write_annotations.py

…

test_write_info_json.py

…

test_youtube_lists.py

[test/test_youtube_lists] Replace mix list

2014-06-07 13:43:27 +02:00

test_youtube_signature.py

…

test_YoutubeDL.py

…