From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Oct 2015 06:03:47 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b031eaee3b099cfbfaa66ddddebf7b805fc87ea4;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

b031eaee3b099cfbfaa66ddddebf7b805fc87ea4