From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 4 Nov 2015 06:43:41 +0000 (-0800)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b25d09a15e58a5339d9720a9c99e48a3b144e1d7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

b25d09a15e58a5339d9720a9c99e48a3b144e1d7