From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 4 Dec 2014 07:34:12 +0000 (+0100)
Subject: release 2014.12.04
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9776bc7f57f061d133b204c056b1cebee775ddad;p=youtube-dl

release 2014.12.04
---

diff --git a/README.md b/README.md
index d6e7ff902..18be078d7 100644
--- a/README.md
+++ b/README.md
@@ -65,10 +65,10 @@ which means you can modify it, redistribute it or use it however you like.
                                      this is not possible instead of searching.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file /etc
-                                     /youtube-dl.conf: do not read the user
-                                     configuration in ~/.config/youtube-dl.conf
-                                     (%APPDATA%/youtube-dl/config.txt on
-                                     Windows)
+                                     /youtube-dl.conf: Do not read the user
+                                     configuration in ~/.config/youtube-
+                                     dl/config (%APPDATA%/youtube-dl/config.txt
+                                     on Windows)
     --flat-playlist                  Do not extract the videos of a playlist,
                                      only list them.
 
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 61902a8cc..7ff8633fe 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2014.12.03'
+__version__ = '2014.12.04'