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