]> granicus.if.org Git - python/commit
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 14 Jan 2012 23:09:07 +0000 (15:09 -0800)
committerGregory P. Smith <greg@krypto.org>
Sat, 14 Jan 2012 23:09:07 +0000 (15:09 -0800)
commitd66b5051551b1d5199aaf5d30368d22232f49524
tree35d7e88a830ae98a5d930c02e456acc136003aba
parent5831bd2f3bdc9b07912fb939afc79d04910971e8
parentee090c71b7278d12b297193c4a6e507c57c612a9
merge heads