From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Jan 2014 21:24:18 +0000 (-0600)
Subject: Issue #20265: Merge with 3.3
X-Git-Tag: v3.4.0b3~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=601d3668444f7bbe73a3aecc7109c6f471dc3c16;p=python

Issue #20265: Merge with 3.3
---

601d3668444f7bbe73a3aecc7109c6f471dc3c16