From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 13 Jun 2014 14:43:32 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1453
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4d1e461a706e914f43b4d80a362b853964ad6de;p=python

Merge with 3.4
---

a4d1e461a706e914f43b4d80a362b853964ad6de