From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 May 2014 18:19:17 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1685
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=384a3ea5c575832c3031eda50704dcfa86e9aebc;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

384a3ea5c575832c3031eda50704dcfa86e9aebc