From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 17 Jun 2015 15:08:44 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b3~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ab4ac8e035060956f71fb73feae567a83bc5fbd;p=python

Merge 3.4
---

4ab4ac8e035060956f71fb73feae567a83bc5fbd