about summary refs log tree commit diff
path: root/youtube_dl/version.py
diff options
context:
space:
mode:
authorrzhxeo <rzhxeot7z81b4700@mailcatch.com>2013-11-18 00:27:06 +0100
committerrzhxeo <rzhxeot7z81b4700@mailcatch.com>2013-11-18 00:27:06 +0100
commit2b35c9ef742bf261078ea10c6c0bba848db1a0df (patch)
treefe80c838c7529c8cab6f1b44d730a2849cd68c48 /youtube_dl/version.py
parent4894fe8c5baec8b1f21ac6fdebe08175abc7f094 (diff)
parent73c566695fac926e7e9e6922fe4e6d82c64a1850 (diff)
downloadyoutube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.gz
youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.xz
youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.zip
Merge branch 'master' into rtmpdump
Conflicts:
	youtube_dl/FileDownloader.py

Merge
Diffstat (limited to 'youtube_dl/version.py')
-rw-r--r--youtube_dl/version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 048afc8e7..110058c79 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2013.10.28'
+__version__ = '2013.11.17'