From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 8 Jun 2014 00:55:53 +0000 (-0700)
Subject: merge 3.4 (#12063)
X-Git-Tag: v3.5.0a1~1495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66f80e92c31cdcede9951d661b3538d862f632b1;p=python

merge 3.4 (#12063)
---

66f80e92c31cdcede9951d661b3538d862f632b1