From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 3 Oct 2014 15:56:22 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~773
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a;p=python

Merge with 3.4
---

4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a