From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Nov 2014 02:10:25 +0000 (-0600)
Subject: merge 3.4 (null)
X-Git-Tag: v3.5.0a1~449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff4d94ef33b8d877b0add9bb6fc3a5b1a240fe1a;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (null)
---

ff4d94ef33b8d877b0add9bb6fc3a5b1a240fe1a