]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Closes #22146: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 5 Aug 2014 19:02:11 +0000 (14:02 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 5 Aug 2014 19:02:11 +0000 (14:02 -0500)

Trivial merge