From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Mar 2014 14:32:37 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1990
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba26001ba6bbdfbb5d3759c9be6ea9a128038c59;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

ba26001ba6bbdfbb5d3759c9be6ea9a128038c59