From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 09:07:35 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a1~1425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b14d023dc16b1516b3d68fa337ceaab097bf753;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

9b14d023dc16b1516b3d68fa337ceaab097bf753