]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorMeador Inge <meadori@gmail.com>
Sun, 14 Apr 2013 01:59:03 +0000 (20:59 -0500)
committerMeador Inge <meadori@gmail.com>
Sun, 14 Apr 2013 01:59:03 +0000 (20:59 -0500)

Trivial merge