]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:45:33 +0000 (13:45 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:45:33 +0000 (13:45 -0500)
commit92843e3c144b3a7a78e1c6b11ec85f06227c42ab
treea26f3984954f688b5a4da6710f5077b941f42961
parent774f83cda4df80ea259d836624a7c3d68ec66495
parent37d72b716488250c0128c53601a0f3fab5ea7faf
merge heads