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

merge heads
---

4fd55ca5258d445c727d7eb1218cc377071c38e2