From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Dec 2014 16:37:18 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~367
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9859daeeb8ad767d2b2cc56f72736810114dd49;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

b9859daeeb8ad767d2b2cc56f72736810114dd49