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'
Merge remote-tracking branch 'upstream/master'
Extractor for defense.gouv.fr
Suggested by @phihag
Merge pull request #1363 from Rudloff/defense

defense.gouv.fr
Merge pull request #1341 from xanadu/master

add support for "-f mp4" for YouTube
release 2013.09.04
Add extractor for daum.net (closes #1330)
Credit  @Huarong for tv.sohu.com
[daum] Get the video page from a canonical url to extract the full id (fixes #1373) and extract description.
Add extractor for tvcast.naver.com (closes #1331)
[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote the url when extracting the id (fixes #1372)