youtube-dl

commit 68acdbda9d940da63a6e8c59e3292313cf07bdf5
parent 27c542c06f816100a64a2e3dbc5396df033aa025
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue, 28 Oct 2014 09:13:23 +0100

Merge remote-tracking branch 'origin/master'

Diffstat:
M
docs/conf.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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