back to 2.x-maint

IPython/core/release.py

@@ -20,11 +20,11 b" name = 'ipython'"
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 2
-_version_minor = 1
+_version_minor = 2
 _version_patch = 0
-# _version_extra = 'maint'
+_version_extra = 'maint'
 # _version_extra = 'rc1'
-_version_extra = ''  # Uncomment this for full releases
+# _version_extra = ''  # Uncomment this for full releases
 
 # release.codename is deprecated in 2.0, will be removed in 3.0
 codename = ''

IPython/html/static/base/js/namespace.js

@@ -7,7 +7,7 b''
 
 var IPython = IPython || {};
 
-IPython.version = "2.1.0";
+IPython.version = "2.2.0-maint";
 
 IPython.namespace = function (ns_string) {
     "use strict";