]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:54:16 +0000 (13:54 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 18 Aug 2011 18:54:16 +0000 (13:54 -0500)
commitacaeff8f159a452ecda6be3ec9b2aeeaedc029f3
tree4564bc9a654491e5ee7de7376395177cf577785e
parent7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4
parent134a8baed9b70b2d6a953d0c872fc2c42580e1b6
merge heads