]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 30 Jun 2011 03:53:19 +0000 (22:53 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 30 Jun 2011 03:53:19 +0000 (22:53 -0500)
commit844315c7514dab785ce7d2e0912645f3fab9d306
treeba54ce9daa8b518ada6ff461ae7d5c7eee3e4eac
parent609da58ae5f7b032bc3161d40e8131f17e509f1e
parent7f86811d55a7a15cb4f29f9fad458aecaf2161d3
merge heads