]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Mostly-null-merge from 3.4 branch following 3.4.2 release.
authorLarry Hastings <larry@hastings.org>
Wed, 8 Oct 2014 09:56:18 +0000 (02:56 -0700)
committerLarry Hastings <larry@hastings.org>
Wed, 8 Oct 2014 09:56:18 +0000 (02:56 -0700)

Trivial merge