]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorChris Jerdonek <chris.jerdonek@gmail.com>
Wed, 28 Nov 2012 10:45:34 +0000 (02:45 -0800)
committerChris Jerdonek <chris.jerdonek@gmail.com>
Wed, 28 Nov 2012 10:45:34 +0000 (02:45 -0800)

Trivial merge