]> granicus.if.org Git - python/commit
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 14 May 2011 22:32:19 +0000 (15:32 -0700)
committerGregory P. Smith <greg@krypto.org>
Sat, 14 May 2011 22:32:19 +0000 (15:32 -0700)
commitec075e6479fa7e98b17625e954b442c205ce5672
treeea48a8208569004ce88156ec62e44452e6d32334
parent79aa5bf5ed78fd298c5744a31a867237d9062090
parentccb33bf0028e966a7b0a3d67f6a83a8bf2cddcff
merge heads