From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 4 Aug 2016 05:02:42 +0000 (-0700)
Subject: merge 3.5 (#27670)
X-Git-Tag: v3.6.0a4~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a44fa1430f9998dc1db8e73faf3fad96df117b6;p=python

merge 3.5 (#27670)
---

5a44fa1430f9998dc1db8e73faf3fad96df117b6
diff --cc configure
index f579ac0b48,d45dd6546f..e06fce424a
--- a/configure
+++ b/configure
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.69 for python 3.5.
 +# Generated by GNU Autoconf 2.69 for python 3.6.
  #
- # Report bugs to <http://bugs.python.org/>.
+ # Report bugs to <https://bugs.python.org/>.
  #
  #
  # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@@ -580,9 -580,9 +580,9 @@@ MAKEFLAGS
  # Identity of this package.
  PACKAGE_NAME='python'
  PACKAGE_TARNAME='python'
 -PACKAGE_VERSION='3.5'
 -PACKAGE_STRING='python 3.5'
 +PACKAGE_VERSION='3.6'
 +PACKAGE_STRING='python 3.6'
- PACKAGE_BUGREPORT='http://bugs.python.org/'
+ PACKAGE_BUGREPORT='https://bugs.python.org/'
  PACKAGE_URL=''
  
  ac_unique_file="Include/object.h"