From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 03:53:55 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2003
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e7f3c032f68d6be5b8f3501ca7c4124394f3a6c;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

3e7f3c032f68d6be5b8f3501ca7c4124394f3a6c