Merge remote-tracking branch 'origin/master'

2014-10-28 09:13:23 +01:00 · 2014-10-28 09:13:23 +01:00 · 68acdbda9d
parent 27c542c06f aaa399d2f6
commit 68acdbda9d
1 changed files with 2 additions and 2 deletions
--- 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