[lynda] Add support for member accounts and paid videos (Closes #2125)
Merge pull request #2138 from dstftw/lynda-membership-support

[lynda] Add support for member accounts and paid videos (Closes #2125)
Merge pull request #2139 from dstftw/master

Tidy help text
[nowvideo] Add support for .sx version (Fixes #2127)
Allow ~ in --download-archive (Fixes #2137)
[nowvideo] Recognize nowvideo.sx urls (fixes #2127)
Merge remote-tracking branch 'origin/master'
Fix --list-formats description (Closes #2142)
Implement a different adult sites checking algorithm
Add a couple of missing http:// in test URLs
Added franceinter [Issue #2105]
franceinter [Issue #2105] 

Added franceinterIE import to reflect addition of FranceInter support. Issue #2105
Made modification as suggested on https://github.com/rg3/youtube-dl/pull/2151
Don’t try to merge the formats if ffmpeg or avconv are not installed
[redtube] Make ‘http:’  not optional (closes #2160)

If the url doesn’t specify the protocol we can’t directly use it to download the webpage, we would need to build a new url.
Instead, we let the generic extractor add the protocol.
[generic] Do not fetch XML URLs (Fixes #2162)
release 2013.01.17
[everyonesmixtape] Add support (Fixes #2161)
release 2013.01.17.1
Merge remote-tracking branch 'sahutd/master'