From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 15:39:18 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.6.0a1~2001
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef57194b38f27d4d6ef0467e8b407bc05a9c270;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

1ef57194b38f27d4d6ef0467e8b407bc05a9c270