Philipp Hagemeister 5f0d813d93 Merge remote-tracking branch 'rupertbaxter2/master' ...

Conflicts:
	youtube_dl/__init__.py
	youtube_dl/downloader/common.py

2015-01-23 12:05:01 +01:00

..

__init__.py

…

common.py

Merge remote-tracking branch 'rupertbaxter2/master'

2015-01-23 12:05:01 +01:00

f4m.py

…

hls.py

…

http.py

…

mplayer.py

…

rtmp.py

…