]> granicus.if.org Git - python/commit
merge heads
authorGregory P. Smith <greg@krypto.org>
Mon, 25 Jun 2012 08:15:53 +0000 (01:15 -0700)
committerGregory P. Smith <greg@krypto.org>
Mon, 25 Jun 2012 08:15:53 +0000 (01:15 -0700)
commit68d34f48bf9bb9a9b888b5243cc00cc25fe0b97c
tree2f4e9320ad6a65e7eb0b12d4da79e843f2605c6c
parent875c1bc522704e8d70f8ea244ff8b25498ce568f
parentaceaf90804b58584b48628ccb72aa01083f277c0
merge heads