]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 19:45:20 +0000 (14:45 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 19:45:20 +0000 (14:45 -0500)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge