From b52089ede1a459733759c87e6dcbdf9b900c6538 Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@3rdcloud.com>
Date: Tue, 17 Dec 2013 12:26:29 +0100
Subject: [PATCH 1/2] Fix NameError.

This was the result of a faulty merge. I'm sorry.
---
 rq/worker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rq/worker.py b/rq/worker.py
index 8cf9d14..f72dc99 100644
--- a/rq/worker.py
+++ b/rq/worker.py
@@ -326,7 +326,7 @@ class Worker(object):
                 self.log.info('%s: %s (%s)' % (green(queue.name),
                     blue(job.description), job.id))
 
-                self.heartbeat((job.timeout or Queue.DEFAULT_TIMEOUT) + 60)
+                self.heartbeat((job.timeout or 180) + 60)
                 self.fork_and_perform_job(job)
                 self.heartbeat()
 

From aa5523215160bbb174a5757c430ef23589213fea Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@3rdcloud.com>
Date: Tue, 17 Dec 2013 12:28:57 +0100
Subject: [PATCH 2/2] Bump version to 0.3.13.

---
 CHANGES.md    | 7 +++++++
 rq/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 184dda9..6665326 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+### 0.3.13
+(December 17th, 2013)
+
+- Bug fix where the worker crashes on jobs that have their timeout explicitly
+  removed.  Thanks for reporting, @algrs.
+
+
 ### 0.3.12
 (December 16th, 2013)
 
diff --git a/rq/version.py b/rq/version.py
index 3b59d7f..954b701 100644
--- a/rq/version.py
+++ b/rq/version.py
@@ -1 +1 @@
-VERSION = '0.3.12'
+VERSION = '0.3.13'