From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Mar 2014 23:52:50 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1981
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00ced0f4c7982f1dd181cd69a1e57e408a15edf9;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

00ced0f4c7982f1dd181cd69a1e57e408a15edf9