aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-01-08 19:36:07 -0800
committerDavid Reid <dreid@dreid.org>2014-01-08 19:36:07 -0800
commit607e423d54f5d4465cde802634d6121735952be6 (patch)
tree6aa0579a12e8b6dcf2ec5fc47c2ccfd4aac7ea78
parent6a050316afc0e67f00c0068d0ba7e61c4b53a8e6 (diff)
parent2b64fe2222e383bd6f68203b9bbcd9d8af7ec1fd (diff)
downloadcryptography-607e423d54f5d4465cde802634d6121735952be6.tar.gz
cryptography-607e423d54f5d4465cde802634d6121735952be6.tar.bz2
cryptography-607e423d54f5d4465cde802634d6121735952be6.zip
Merge pull request #435 from reaperhulk/0.2-dev-open
Update version to 0.2.dev1 on master
-rw-r--r--cryptography/__about__.py2
-rw-r--r--docs/changelog.rst4
2 files changed, 5 insertions, 1 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 95f85749..aa1878da 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -22,7 +22,7 @@ __summary__ = ("cryptography is a package designed to expose cryptographic "
"recipes and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.1"
+__version__ = "0.2.dev1"
__author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, "
"Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, "
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b2d24c58..41db635e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,5 +1,9 @@
Changelog
=========
+0.2 - 2014-XX-XX
+~~~~~~~~~~~~~~~~
+
+* In development.
0.1 - 2014-01-08
~~~~~~~~~~~~~~~~