]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorZachary Ware <zachary.ware@gmail.com>
Sun, 24 Nov 2013 07:20:14 +0000 (01:20 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 24 Nov 2013 07:20:14 +0000 (01:20 -0600)

Trivial merge