]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 15:49:43 +0000 (10:49 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 15:49:43 +0000 (10:49 -0500)

Trivial merge