]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Mon, 25 Nov 2013 08:32:20 +0000 (00:32 -0800)
committerGregory P. Smith <greg@krypto.org>
Mon, 25 Nov 2013 08:32:20 +0000 (00:32 -0800)

Trivial merge