From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Mar 2015 18:24:12 +0000 (-0500)
Subject: merge 3.4 (null)
X-Git-Tag: v3.5.0a2~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c0a82038dcefb35d0421ca1da9b11b2219a39d4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (null)
---

6c0a82038dcefb35d0421ca1da9b11b2219a39d4