From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 20 Sep 2015 18:18:51 +0000 (+0500)
Subject: merge 3.4 (#25145)
X-Git-Tag: v3.5.1rc1~322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25145)
---

fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938