From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 3 Nov 2014 20:12:52 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~529
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93