]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.4.
authorZachary Ware <zachary.ware@gmail.com>
Thu, 7 May 2015 01:19:35 +0000 (20:19 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 7 May 2015 01:19:35 +0000 (20:19 -0500)

Trivial merge