release 2016.12.15

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 24c11302be078d8eeca0a836eaee6f6976b5f7e5..7bf8d6fd40309e0e315ea5ab12de05f9c42b31fc 100644 (file)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,8 +6,8 @@
 
 ---
 
-### Make sure you are using the *latest* version: run `youtube-dl --version` and ensure your version is *2016.12.12*. If it's not read [this FAQ entry](https://github.com/rg3/youtube-dl/blob/master/README.md#how-do-i-update-youtube-dl) and update. Issues with outdated version will be rejected.
-- [ ] I've **verified** and **I assure** that I'm running youtube-dl **2016.12.12**
+### Make sure you are using the *latest* version: run `youtube-dl --version` and ensure your version is *2016.12.15*. If it's not read [this FAQ entry](https://github.com/rg3/youtube-dl/blob/master/README.md#how-do-i-update-youtube-dl) and update. Issues with outdated version will be rejected.
+- [ ] I've **verified** and **I assure** that I'm running youtube-dl **2016.12.15**
 
 ### Before submitting an *issue* make sure you have:
 - [ ] At least skimmed through [README](https://github.com/rg3/youtube-dl/blob/master/README.md) and **most notably** [FAQ](https://github.com/rg3/youtube-dl#faq) and [BUGS](https://github.com/rg3/youtube-dl#bugs) sections
@@ -35,7 +35,7 @@ $ youtube-dl -v <your command line>
 [debug] User config: []
 [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
-[debug] youtube-dl version 2016.12.12
+[debug] youtube-dl version 2016.12.15
 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
 [debug] Proxy map: {}

diff --git a/ChangeLog b/ChangeLog
index 3aa327e0024e1580b2ee889d13e2ef424c7b7c60..a9bfd2711760cc9e3d271a72cd90c7bfa99be623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-version <unreleased>
+version 2016.12.15
 
 Core
 + [utils] Add convenience urljoin

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index edb76d9cc9eef838d1146a487e80fbc35a9f5ae7..226552d4d4656306cbaeef6824426691df8bffc6 100644 (file)
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -402,6 +402,7 @@
  - **MatchTV**
  - **MDR**: MDR.DE and KiKA
  - **media.ccc.de**
+ - **MelonVOD**
  - **META**
  - **metacafe**
  - **Metacritic**

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 55ccaf66ac80ccde536826d784307f0dfc93a9d1..a4bba4a52ca463bed7937bff44accd2c69ba68d2 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2016.12.12'
+__version__ = '2016.12.15'