Merge remote-tracking branch 'upstream/master'
Update generator

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>
Add RTLnow extractor

Supports http://rtl2now.rtl2.de and http://rtl-now.rtl.de
Add RTLnow extractor
Update algo - see #1254

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>
Merge branch 'master' into py-generator
Merge remote-tracking branch 'rzhxeo/rtlnow'
Add VOXnow to RTLnow extractor
Merge pull request #1273 from rzhxeo/rtlnow

Add support for http://voxnow.de
[youtube] Support watch_popup URLs (Fixes #1275)
Merge remote-tracking branch 'upstream/master'
Add YouTube DASH formats to YouTubeIE
fix failed tests
[collegehumor] Allow old-style videos (Fixes #1285)
Cache suitable regular expressions

This speeds up TestAllURLsMatching.test_no_duplicates by about 8000% at the cost of minimal memory overhead.
[generic] Ignore stupid HTTP servers (#1284)
[generic] support HTML5 video
release 2013.08.21
[rtlnow] Add support for error message for queries from outside of Germany
Allow hours in ETA display (Fixes #1280)