From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 26 Jun 2014 20:22:16 +0000 (-0500)
Subject: Issue #21829: Merge with 3.4
X-Git-Tag: v3.5.0a1~1397
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c59a49dddaf9394c078bae1895a03e202bf1f1da;p=python

Issue #21829: Merge with 3.4
---

c59a49dddaf9394c078bae1895a03e202bf1f1da