From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Nov 2014 04:38:23 +0000 (-0500)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27ee75f1913452d7325a1dac7302d402150639f8;p=python

merge 3.4
---

27ee75f1913452d7325a1dac7302d402150639f8