commit 67ea444a05818703f7a595c5014d9fbc43d80c9c
author Paul Kehrer <paul.l.kehrer@gmail.com> Sat Jun 04 12:00:54 2016 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Sat Jun 04 12:00:54 2016 -0700
tree 0a6fab60b4a5c7cd3b6dd13dd82e6904d2f8c94f
parent 69365ce2041081fe6b109496bbb9c56f86ccb7b5

reopen master for work on fifteenth release (#2964)

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1aa2131..65dfebe 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.5 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+
 1.4 - 2016-06-04
 ~~~~~~~~~~~~~~~~
 

src/cryptography/__about__.py

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index dc7c412..15ed36d 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.4"
+__version__ = "1.5.dev1"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"

vectors/cryptography_vectors/__about__.py

diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 5d90e88..f756b9d 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.4"
+__version__ = "1.5.dev1"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"