]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 29 Sep 2012 18:56:41 +0000 (11:56 -0700)
committerGregory P. Smith <greg@krypto.org>
Sat, 29 Sep 2012 18:56:41 +0000 (11:56 -0700)

Trivial merge