]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 24 Oct 2011 12:51:46 +0000 (08:51 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 24 Oct 2011 12:51:46 +0000 (08:51 -0400)
commit22dabb6ffa5860ee08138c2f67b0406d566df5f4
tree554c26e10f49f9944406db93276eec579bbe417e
parent414ffa86b5d8286b7d24ac35677bd90b98fe21b4
parent8671157863060f259394d76e35ca6bfd594024be
merge heads