]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2012 15:00:38 +0000 (09:00 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2012 15:00:38 +0000 (09:00 -0600)
commit02ffa08990085cffacb7cbdcc6bcde767dac6256
treee60ad7fb54b05c079c83c5ecab73b2d51f631c4c
parent22a29708fd99325fef8e462bce0ff5b67210cb23
parent42663334cd9ef3348732e6a229478e67730b4ecb
merge heads