]> granicus.if.org Git - python/commitdiff
Merge 3.2 and revert changes since the changes in 3.3 are a bit different
authorEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:25:17 +0000 (05:25 -0800)
committerEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:25:17 +0000 (05:25 -0800)

Trivial merge