Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add support for "-f mp4" for YouTube
Merge remote-tracking branch 'upstream/master'
Extractor for defense.gouv.fr
[vimeo] add support for videos that embed the download url in the player page (fixes #1364)
[vimeo] Handle Assertions Error when trying to get the description

In some pages the html tags are not closed, python 2.6 cannot handle it.
[dailymotion] improve the regex for extracting the video info
[orf] Remove the test video, they seem to expire in one week
Suggested by @phihag
Merge remote-tracking branch 'upstream/master'
Merge pull request #1363 from Rudloff/defense

defense.gouv.fr
AHLS -> Apple HTTP Live Streaming
Merge pull request #1341 from xanadu/master

add support for "-f mp4" for YouTube