From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 13:56:47 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e30c8fc5b4be726fed38d4f128f5e1f25f0b6ad1;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

e30c8fc5b4be726fed38d4f128f5e1f25f0b6ad1