From a0e9046c2cc6fae0e6f1189f1873a87cf24c7477 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sun, 17 May 2015 09:17:52 +0200
Subject: [PATCH] prepare for 2.2 release

---
 RELEASE-NOTES  | 6 ++++++
 lib/daemon.py  | 2 +-
 lib/version.py | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 087a1e4c..d5590267 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,9 @@
+# Release 2.2
+ * Show thousands separators in GUI
+ * Show unmatured coins in balance
+ * Fix exchange rates plugin
+ * Network layer: refactoring and fixes
+
 # Release 2.1.1
  * patch a bug that prevents new wallet creation.
  * fix connection issue on osx binaries
diff --git a/lib/daemon.py b/lib/daemon.py
index 706f7c88..e80e7d92 100644
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -115,7 +115,7 @@ class NetworkServer(util.DaemonThread):
 
     def __init__(self, config):
         util.DaemonThread.__init__(self)
-        self.debug = 1
+        self.debug = False
         self.config = config
         self.network = Network(config)
         # network sends responses on that queue
diff --git a/lib/version.py b/lib/version.py
index a9c5dd90..5572e9e2 100644
--- a/lib/version.py
+++ b/lib/version.py
@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = "2.1.1"  # version of the client package
+ELECTRUM_VERSION = "2.2"    # version of the client package
 PROTOCOL_VERSION = '0.9'    # protocol version requested
 NEW_SEED_VERSION = 11       # electrum versions >= 2.0
 OLD_SEED_VERSION = 4        # electrum versions < 2.0