Merge remote-tracking branch 'origin/master'

pull/4069/head
Philipp Hagemeister 2014-10-28 09:13:23 +01:00
commit 68acdbda9d
1 changed files with 2 additions and 2 deletions

View File

@ -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