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

Trivial merge