From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 22 Jan 2014 18:58:31 +0000 (+0100)
Subject: Merge branch 'youtube-dash-manifest'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=50317b111dadccba73bcdd828d9997d1da78a5f1;p=youtube-dl

Merge branch 'youtube-dash-manifest'

Conflicts:
	youtube_dl/extractor/youtube.py
---

50317b111dadccba73bcdd828d9997d1da78a5f1
diff --cc youtube_dl/extractor/youtube.py
index 248b30ffb,b943f19f9..870b7c4ca
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -27,7 -27,7 +27,8 @@@ from ..utils import 
      get_element_by_id,
      get_element_by_attribute,
      ExtractorError,
+     int_or_none,
 +    RegexNotFoundError,
      unescapeHTML,
      unified_strdate,
      orderedSet,