]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Tue, 19 Mar 2013 22:31:05 +0000 (15:31 -0700)
committerGregory P. Smith <greg@krypto.org>
Tue, 19 Mar 2013 22:31:05 +0000 (15:31 -0700)

Trivial merge