From 0d4de870a5159d491b604d29780f6bfb539c49f3 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Thu, 12 Nov 2015 14:56:51 +0100
Subject: [PATCH] prepare 2.5.4 release

---
 RELEASE-NOTES                            | 3 +++
 contrib/build-wine/build-electrum-git.sh | 1 -
 lib/version.py                           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8edef06a9..68d1ef564 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,6 @@
+# Release 2.5.4
+ * increase MIN_RELAY_TX_FEE to avoid dust transactions
+
 # Release 2.5.3 (bugfixes)
  * installwizard: do not allow direct copy-paste of the seed
  * installwizard: fix bug #1531 (starting offline)
diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
index 998c1f56c..a07dcc7c5 100755
--- a/contrib/build-wine/build-electrum-git.sh
+++ b/contrib/build-wine/build-electrum-git.sh
@@ -24,7 +24,6 @@ if [ -d "electrum-git" ]; then
     echo "Pull"
     cd electrum-git
     git pull
-    git checkout $1
     cd ..
 else
     # GIT repository not found, clone it
diff --git a/lib/version.py b/lib/version.py
index b99f568ca..5f999bcfa 100644
--- a/lib/version.py
+++ b/lib/version.py
@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = '2.5.3'  # version of the client package
+ELECTRUM_VERSION = '2.5.4'  # version of the client package
 PROTOCOL_VERSION = '0.10'   # protocol version requested
 NEW_SEED_VERSION = 11       # electrum versions >= 2.0
 OLD_SEED_VERSION = 4        # electrum versions < 2.0