From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 7 Jul 2014 19:31:58 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=345511a4a6cc3b1ac37f85b686d7095e6d7d4cde;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

345511a4a6cc3b1ac37f85b686d7095e6d7d4cde