]> granicus.if.org Git - python/commitdiff
merge 3.3
authorEli Bendersky <eliben@gmail.com>
Sun, 7 Oct 2012 14:24:24 +0000 (07:24 -0700)
committerEli Bendersky <eliben@gmail.com>
Sun, 7 Oct 2012 14:24:24 +0000 (07:24 -0700)

Trivial merge