Merge tag 'upstream/2014.11.23'

[youtubedl] / youtube_dl / version.py

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index d5986f5e64885aed3c8305c8cadac433df85701f..6be5d07c481ae9e4aff6b247a1b5083a2564be54 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2012.12.11'
+__version__ = '2014.11.23'