From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 Oct 2014 19:50:50 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.5.0a1~670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d67799b7148ae2182af3e5aa41c6343d7cd29f2;p=python

merge heads
---

4d67799b7148ae2182af3e5aa41c6343d7cd29f2