From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 02:32:12 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1900
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79f3ef63361b00e2e70a9d8edba6afa5096d3380;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

79f3ef63361b00e2e70a9d8edba6afa5096d3380