Merge remote-tracking branch 'origin/develop' into develop

zsiciarz · Jan 24, 2013 · 2e9eb3f · 2e9eb3f
2 parents a0f9621 + fa50d4e
commit 2e9eb3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+0.6.0
+ - Python 3 compatibility!
+
 0.5.1
  - fixed template loading in tests
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -42,16 +42,16 @@
 
 # General information about the project.
 project = u'django-envelope'
-copyright = u'2011-2012, Zbigniew Siciarz'
+copyright = u'2011-2013, Zbigniew Siciarz'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.5.1'
+version = '0.6.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.1'
+release = '0.6.0'
 
 intersphinx_mapping = {
     'django': ('https://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/')

diff --git a/envelope/__init__.py b/envelope/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (0, 5, 1, 'final', 0)
+__version_info__ = (0, 6, 0, 'final', 0)
 
 
 def get_version():