[Python-checkins] cpython (merge 3.3 -> 3.4): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/0c0f90e8df26
changeset:   89809:0c0f90e8df26
branch:      3.4
parent:      89803:3a3a83195159
parent:      89808:df2dbeef46da
user:        Georg Brandl <georg at python.org>
date:        Mon Mar 17 07:36:51 2014 +0100
summary:
  merge with 3.3

files:
  Doc/tools/sphinxext/static/version_switch.js |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js
--- a/Doc/tools/sphinxext/static/version_switch.js
+++ b/Doc/tools/sphinxext/static/version_switch.js
@@ -2,7 +2,8 @@
   'use strict';
 
   var all_versions = {
-    '3.4': 'dev (3.4)',
+    '3.5': 'dev (3.5)',
+    '3.4': '3.4',
     '3.3': '3.3',
     '3.2': '3.2',
     '2.7': '2.7',

-- 
Repository URL: http://hg.python.org/cpython