]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads.
authorSenthil Kumaran <senthil@uthcode.com>
Thu, 3 Sep 2015 09:50:51 +0000 (02:50 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Thu, 3 Sep 2015 09:50:51 +0000 (02:50 -0700)

Trivial merge