]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 00:24:31 +0000 (19:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 00:24:31 +0000 (19:24 -0500)
commiteabfb5b1b9eb621e414bbe60b8665b4c96acf0cc
treec40cd901324df90ec5ef49b4f364645ab5b4a8d3
parent0c1036270d89aeb2d972e2dd8ae4b52b024a9658
parentd628496323bf594679b3d5b3e10d85da8a1c8996
merge heads