From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 23 Feb 2015 16:13:03 +0000 (+0100)
Subject: Merge branch 'subtitles-rework'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=youtube-dl.git;a=commitdiff_plain;h=bfc993cc9183d5f001e30267551bcdf9f0a98be9

Merge branch 'subtitles-rework'

(Closes PR #4964)
---

bfc993cc9183d5f001e30267551bcdf9f0a98be9
diff --cc youtube_dl/extractor/vimeo.py
index 4cd2f73d9,5930d5984..8f540f578
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@@ -4,10 -4,8 +4,9 @@@ from __future__ import unicode_literal
  import json
  import re
  import itertools
 +import hashlib
  
  from .common import InfoExtractor
- from .subtitles import SubtitlesInfoExtractor
  from ..compat import (
      compat_HTTPError,
      compat_urllib_parse,