]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 14 Apr 2014 20:45:49 +0000 (16:45 -0400)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 14 Apr 2014 20:45:49 +0000 (16:45 -0400)

Trivial merge