summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-12-04 14:19:07 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-12-04 14:19:07 +0100
commit671c0f151d5a7bb5c32a59f483a8e330f1f9a15b (patch)
tree4bcc5475a6b52acae723643d729e13fb283127c2
parent27dcce19045670fc348ff1119c0d2283aaed3ae2 (diff)
downloadyoutube-dl-671c0f151d5a7bb5c32a59f483a8e330f1f9a15b.tar.gz
youtube-dl-671c0f151d5a7bb5c32a59f483a8e330f1f9a15b.tar.xz
youtube-dl-671c0f151d5a7bb5c32a59f483a8e330f1f9a15b.zip
release 2013.12.04 2013.12.04
-rw-r--r--README.md3
-rw-r--r--youtube_dl/version.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index 00975ab5e..029c418d1 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ which means you can modify it, redistribute it or use it however you like.
     --list-extractors          List all supported extractors and the URLs they
                                would handle
     --extractor-descriptions   Output descriptions of all supported extractors
-    --proxy URL                Use the specified HTTP/HTTPS proxy
+    --proxy URL                Use the specified HTTP/HTTPS proxy. Pass in an
+                               empty string (--proxy "") for direct connection
     --no-check-certificate     Suppress HTTPS certificate validation.
     --cache-dir DIR            Location in the filesystem where youtube-dl can
                                store downloaded information permanently. By
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index f9a339c02..68b30bfd4 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2013.12.03'
+__version__ = '2013.12.04'