From 1d086f85f46f86646c4889ceaf6e1c4c3a05708d Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Wed, 13 May 2015 20:18:11 -0700
Subject: [PATCH] Close out 1.4 dev

Master is now 1.5.0-dev (to avoid accidents),
but the 1.4 branch is expected to be the end
of the 1.x line.

2.0 development will begin on a separate branch soon.
---
 djrill/_version.py | 2 +-
 docs/history.rst   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/djrill/_version.py b/djrill/_version.py
index c95923f..91f181c 100644
--- a/djrill/_version.py
+++ b/djrill/_version.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 0, 'dev')  # Remove the 'dev' component in release branches
+VERSION = (1, 5, 0, 'dev')  # Remove the 'dev' component in release branches
 __version__ = '.'.join([str(x) for x in VERSION[:3]])  # major.minor.patch
 if len(VERSION) > 3:  # x.y.z-pre.release (note the hyphen)
     __version__ += '-' + '.'.join([str(x) for x in VERSION[3:]])
diff --git a/docs/history.rst b/docs/history.rst
index a96ce0f..c730a03 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -69,7 +69,7 @@ DeprecationWarning if you are still importing DjrillBackendHTTPError.
 Change Log
 ----------
 
-Version 1.4 (development):
+Version 1.4:
 
 * Django 1.8 support
 * Support new Django 1.8 EmailMessage reply_to param.