commit c5b430f7ec091c02017fd07c7871ea0a4b2de044
author Paul Kehrer <paul.l.kehrer@gmail.com> Thu Oct 29 07:52:35 2015 +0900
committer Paul Kehrer <paul.l.kehrer@gmail.com> Thu Oct 29 07:52:35 2015 +0900
tree c74f77bf80d73950c52464d156be3afef2cd05b0
parent 246a44e78c0d370452b3c5508d5fdabbb1b04c99

reopen master for development on the twelfth release

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9518a3d..811a351 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
 1.1 - 2015-10-28
 ~~~~~~~~~~~~~~~~
 

src/cryptography/__about__.py

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 013ca3a..fbc1e73 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.1"
+__version__ = "1.2.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 e96c235..63f0b57 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.1"
+__version__ = "1.2.dev1"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"