From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 29 Mar 2014 00:26:46 +0000 (-0600)
Subject: Merge 3.4 into default.
X-Git-Tag: v3.5.0a1~2003
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb43286a7c77e7ff6ac907e4ac90aaaae5a62b3f;p=python

Merge 3.4 into default.
---

eb43286a7c77e7ff6ac907e4ac90aaaae5a62b3f