From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 17:40:34 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.5.0a1~651^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c966103be6f6f8f647a3b07f79386701b29579cc;p=python

merge heads
---

c966103be6f6f8f647a3b07f79386701b29579cc