From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 Oct 2014 19:51:28 +0000 (-0400)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49714f402feb414e62a1cffc64568af5e80556d2;p=python

merge heads
---

49714f402feb414e62a1cffc64568af5e80556d2