From cc56764ee97ab9a9df6316bab23a0db1bc958f5f Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Wed, 15 Oct 2014 21:08:23 +0100
Subject: Bump version to 1.3.10 and update changelog

---
 ChangeLog                 | 8 ++++++++
 docs/man/deluge-console.1 | 2 +-
 docs/man/deluge-gtk.1     | 2 +-
 docs/man/deluge-web.1     | 2 +-
 docs/man/deluge.1         | 2 +-
 docs/man/deluged.1        | 2 +-
 osx/Info.plist            | 6 +++---
 setup.py                  | 2 +-
 8 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4839d6f76..0de479e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+=== Deluge 1.3.10 (15 October 2014) ===
+==== GtkUI ====
+	* #2256: Indexes are not updated correctly when removing column
+	* Fix bug in the torrentview when Plugins added a column
+
+==== WebUI ====
+	* Security update for POODLE vulnerability
+
 === Deluge 1.3.9 (4 October 2014) ===
 ==== GtkUI ====
 	* #2514: Fix every torrent is displayed twice in classic mode
diff --git a/docs/man/deluge-console.1 b/docs/man/deluge-console.1
index 1f727c006..78a81839a 100644
--- a/docs/man/deluge-console.1
+++ b/docs/man/deluge-console.1
@@ -1,4 +1,4 @@
-.TH DELUGE-CONSOLE 1 "October 2014" "1.3.9"
+.TH DELUGE-CONSOLE 1 "October 2014" "1.3.10"
 
 .SH NAME
 deluge-console - a bittorrent client curses interface
diff --git a/docs/man/deluge-gtk.1 b/docs/man/deluge-gtk.1
index cf792c274..a18ac78fa 100644
--- a/docs/man/deluge-gtk.1
+++ b/docs/man/deluge-gtk.1
@@ -1,4 +1,4 @@
-.TH DELUGE-GTK 1 "October 2014" "1.3.9"
+.TH DELUGE-GTK 1 "October 2014" "1.3.10"
 
 .SH NAME
 deluge-gtk - a bittorrent client gtk interface
diff --git a/docs/man/deluge-web.1 b/docs/man/deluge-web.1
index cab37f474..79f2b34c2 100644
--- a/docs/man/deluge-web.1
+++ b/docs/man/deluge-web.1
@@ -1,4 +1,4 @@
-.TH DELUGE-WEB 1 "October 2014" "1.3.9"
+.TH DELUGE-WEB 1 "October 2014" "1.3.10"
 
 .SH NAME
 deluge-web - a bittorrent client ajax web interface
diff --git a/docs/man/deluge.1 b/docs/man/deluge.1
index a4d2a7f12..34906c4af 100644
--- a/docs/man/deluge.1
+++ b/docs/man/deluge.1
@@ -1,4 +1,4 @@
-.TH DELUGE 1 "October 2014" "1.3.9"
+.TH DELUGE 1 "October 2014" "1.3.10"
 
 .SH NAME
 deluge - a bittorrent client
diff --git a/docs/man/deluged.1 b/docs/man/deluged.1
index b4036c3ce..858f2b565 100644
--- a/docs/man/deluged.1
+++ b/docs/man/deluged.1
@@ -1,4 +1,4 @@
-.TH DELUGED 1 "October 2014" "1.3.9"
+.TH DELUGED 1 "October 2014" "1.3.10"
 
 .SH NAME
 deluged - a bittorrent client daemon
diff --git a/osx/Info.plist b/osx/Info.plist
index ebf74e07b..a038205d1 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -11,11 +11,11 @@
 	<key>CFBundleExecutable</key>
 	<string>Deluge</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.9</string>
+	<string>1.3.10</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.9</string>
+	<string>1.3.10</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.3.9 (c) 2008-2014 Deluge Team http://deluge-torrent.org/</string>
+	<string>1.3.10 (c) 2008-2014 Deluge Team http://deluge-torrent.org/</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2008-2014 Deluge Team</string>
 	<key>CFBundleDevelopmentRegion</key>
diff --git a/setup.py b/setup.py
index b3c91b6a8..d16a0d21d 100755
--- a/setup.py
+++ b/setup.py
@@ -533,7 +533,7 @@ if windows_check():
 # Main setup
 setup(
     name = "deluge",
-    version = "1.3.9",
+    version = "1.3.10",
     fullname = "Deluge Bittorrent Client",
     description = "Bittorrent Client",
     author = "Andrew Resch, Damien Churchill",
-- 
cgit