From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 03:53:45 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.6.0a1~2004
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=191a8f0a342f5f6c9fc6f1572a33e389d3f682b2;p=python

merge heads
---

191a8f0a342f5f6c9fc6f1572a33e389d3f682b2