From 7ac3d510a299552fc05a3851f2bd58f2e4efdc12 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 11 Jul 2014 14:12:52 +0930
Subject: [PATCH] update ready for merge.

---
 changelog.txt          | 17 +++++++++++++++++
 nzbtomedia/__init__.py |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 81ae4696..d08052e9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,22 @@
 Change_LOG / History
 
+V10.1 11/07/2014
+
+Impacts All
+Improved Transcoder
+Minor Bug Fixes
+Now accepts Number of Audio Channels for Transcoder options.
+Userscript can perform video corruption check first.
+Improved extraction. Extract all subdirs and multiple "unique" archives in a directory.
+Check if already running and wait for complete before continuing.
+
+Impacts NZBs
+Allow UserScript for NZBs
+
+Impacts Torrents
+Do Extraction Before Flatten
+
+
 V10.0 03/07/2014
 
 Impacts All
diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index 45038f77..442c2e08 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -264,7 +264,7 @@ def initialize(section=None):
     nzbToMediaDB.upgradeDatabase(nzbToMediaDB.DBConnection(), mainDB.InitialSchema)
 
     # Set Version and GIT variables
-    NZBTOMEDIA_VERSION = '10.0'
+    NZBTOMEDIA_VERSION = '10.1'
     VERSION_NOTIFY = int(CFG['General']['version_notify'])
     AUTO_UPDATE = int(CFG['General']['auto_update'])
     GIT_REPO = 'nzbToMedia'