Merge tag 'upstream/2014.12.01'

[youtubedl] / docs / conf.py

diff --git a/docs/conf.py b/docs/conf.py
index 4a04ad779722f191085cf5bd3b927d89e4afa385..594ca61a6bf984d173620a3e95eaca28b22cda5a 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,8 +44,8 @@ copyright = u'2014, Ricardo Garcia Gonzalez'
 # built documents.
 #
 # The short X.Y version.
-import youtube_dl
-version = youtube_dl.__version__
+from youtube_dl.version import __version__
+version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version