From 7a0dcf5c61b6fd62be5f5c2cd9aa2b896474fa7d 2014-05-21 19:59:25
From: MinRK <benjaminrk@gmail.com>
Date: 2014-05-21 19:59:25
Subject: [PATCH] back to 2.x-maint
---

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 9912aa7..ecb9831 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@ 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 = ''
diff --git a/IPython/html/static/base/js/namespace.js b/IPython/html/static/base/js/namespace.js
index a086178..bb46e31 100644
--- a/IPython/html/static/base/js/namespace.js
+++ b/IPython/html/static/base/js/namespace.js
@@ -7,7 +7,7 @@
 
 var IPython = IPython || {};
 
-IPython.version = "2.1.0";
+IPython.version = "2.2.0-maint";
 
 IPython.namespace = function (ns_string) {
     "use strict";