]> granicus.if.org Git - python/commit
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)
commit8ce589cf7b874f3d0323612e0c25f12cc6d844da
tree826f559dfff62ca685ee36a9a6e94bdfa901a78b
parent02dee1acd8d905a2348e5ed4d9f97cb490e5e255
parentad4d9c9bf019608b5729adf0d4257c4a7cbf41b0
merge heads