]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 7 Jul 2015 04:30:16 +0000 (23:30 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 7 Jul 2015 04:30:16 +0000 (23:30 -0500)

Trivial merge