]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 3 Jun 2011 22:50:59 +0000 (17:50 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 3 Jun 2011 22:50:59 +0000 (17:50 -0500)
commit4dfcb1a00dbcbc76fcd152d652d3f83b53b14e45
tree99acf90091031bcf16aa91eb93a4ca69e754e4eb
parent48deae12d511eabd8d73a2e4a135e6321a88b48c
parentab5fcc00a7a50c4c61f0a7247b21a0728c134779
merge heads