From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 29 Apr 2015 22:00:57 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31cd7562b045f28692bf906f66534704760b3609;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

31cd7562b045f28692bf906f66534704760b3609