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