From: Ned Deily <nad@python.org>
Date: Fri, 3 Jun 2016 22:20:13 +0000 (-0700)
Subject: final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads
X-Git-Tag: v3.5.2rc1~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=369826a879386a6de7e493e5b789fd8a5b5fa5be;p=thirdparty%2FPython%2Fcpython.git

final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads
---

369826a879386a6de7e493e5b789fd8a5b5fa5be