[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/734b557342bd
changeset:   96321:734b557342bd
parent:      96318:e57e37c3986c
parent:      96320:3d558ecd9936
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed May 27 18:32:53 2015 -0500
summary:
  merge 3.5

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


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

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