]> granicus.if.org Git - python/commitdiff
Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.
authorChris Jerdonek <chris.jerdonek@gmail.com>
Sat, 13 Oct 2012 03:31:50 +0000 (20:31 -0700)
committerChris Jerdonek <chris.jerdonek@gmail.com>
Sat, 13 Oct 2012 03:31:50 +0000 (20:31 -0700)

Trivial merge