[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)
Merge remote-tracking branch 'upstream/master'