From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 4 Dec 2013 13:19:07 +0000 (+0100)
Subject: release 2013.12.04
X-Git-Tag: 2013.12.04^0
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=671c0f151d5a7bb5c32a59f483a8e330f1f9a15b;p=youtube-dl.git

release 2013.12.04
---

diff --git a/README.md b/README.md
index 00975ab5ea..029c418d16 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 f9a339c028..68b30bfd4a 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2013.12.03'
+__version__ = '2013.12.04'