Make socket timeout configurable, and bump default to 10 minutes (#1862)
Merge branch 'master' of github.com:rg3/youtube-dl
Add --socket-timeout option
release 2013.12.02
Added extractors for smotri.com
Merge branch 'smotri.com' of https://github.com/dstftw/youtube-dl
[smotri] Simplify
Credit @dstftw for smotri IE