Merge remote-tracking branch 'origin/master'

This commit is contained in:
Philipp Hagemeister 2014-03-03 12:05:59 +01:00
commit dcdfd1c711
2 changed files with 2 additions and 2 deletions

View file

@ -8,8 +8,8 @@ from ..utils import (
unified_strdate,
str_to_int,
parse_duration,
clean_html,
)
from youtube_dl.utils import clean_html
class FourTubeIE(InfoExtractor):

View file

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
from youtube_dl.utils import ExtractorError
from ..utils import ExtractorError
class TinyPicIE(InfoExtractor):