From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 2 May 2014 15:52:12 +0000 (-0500)
Subject: Closes #18604: Merge with 3.4
X-Git-Tag: v3.5.0a1~1751
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb2ad801ac2bbee4f72c935e7fa57cc5b50382f2;p=thirdparty%2FPython%2Fcpython.git

Closes #18604: Merge with 3.4
---

cb2ad801ac2bbee4f72c935e7fa57cc5b50382f2