Merge branch 'ping-viki-shows'
[youtube-dl] / youtube_dl / extractor / nationalgeographic.py
2015-02-23 Jaime Marquínez... Merge branch 'subtitles-rework'
2015-02-19 Jaime Marquínez... [nationalgeographic] Add extractor (closes #4960)