Merge branch 'youtube-dash-manifest'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 22 Jan 2014 18:58:31 +0000 (19:58 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 22 Jan 2014 18:58:31 +0000 (19:58 +0100)
commit50317b111dadccba73bcdd828d9997d1da78a5f1
treec3504ea6f73ef1d44934a58e7a2e4c752a0f98b3
parentd7975ea28785e1d2c344ee65acff873edb43e914
parentdd27fd1739ad7fed878ecab17e51001c336d1190
Merge branch 'youtube-dash-manifest'

Conflicts:
youtube_dl/extractor/youtube.py
youtube_dl/YoutubeDL.py
youtube_dl/extractor/common.py
youtube_dl/extractor/youtube.py
youtube_dl/utils.py