Added an IE for hark.com
Download videos from jeuxvideo.com
Merge remote-tracking branch 'upstream/master'

Conflicts:
	youtube_dl/extractor/jeuxvideo.py
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Extractor for canalc2.tv
lxml is not part of the standard library.
Merge pull request #1231 from yasoob/master

Added an IE for hark.com
[generic] small typo
Merge remote-tracking branch 'origin/master'
fixed tests for c56 and dailymotion
Merge pull request #1315 from yasoob/master

fixed tests for c56 and dailymotion
[trilulilu] Add support for trilulilu.ro

Fun fact: The ads (not yet supported) are loaded from youtube ;)
Merge branch 'master' of github.com:rg3/youtube-dl
release 2013.08.27
[canalplus] Accept player.canalplus.fr urls
[hark] get the song info in JSON and extract more information.
Merge remote-tracking branch 'Rudloff/canalc2'
[canalc2] Small improvements
Add an extractor for CNN (closes #1318)