From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Apr 2015 18:16:25 +0000 (-0400)
Subject: merge 3.4 (#24057)
X-Git-Tag: v3.5.0b1~293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=644adc6adaecf5249de68211f70c0825a36fe6f7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#24057)
---

644adc6adaecf5249de68211f70c0825a36fe6f7