]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 31 May 2011 00:25:43 +0000 (19:25 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 31 May 2011 00:25:43 +0000 (19:25 -0500)
commitcccfd9932dcbf808ca3b3e2c494799dfab4ae074
tree287d56155899a1cd0b7f68eb581e792ee3e4b792
parent15ac3110883c7f6e5cde5dd308baf178e666b985
parent1eb6d278a8139dda25efbe1b3509aac159bc54fd
merge heads