From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 15:39:13 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.5.0b4~75^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95f9dd5e72d6a72db0ad7438b65990cba30cf36b;p=python

merge heads
---

95f9dd5e72d6a72db0ad7438b65990cba30cf36b