]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 30 May 2011 16:15:05 +0000 (11:15 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 30 May 2011 16:15:05 +0000 (11:15 -0500)
commitc6c5e0461174d60b9d8ef35336e9576dbdc6121c
tree1c03f9845997f30aaafb967ba5ec4ec681d86d18
parent758888d437c4c2d398ec322ff1596e1620f5f0dd
parent1ae2998f3edaac9d0e98a62847b5d541f5f50ce0
merge heads