]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 24 Jun 2014 03:16:06 +0000 (20:16 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 24 Jun 2014 03:16:06 +0000 (20:16 -0700)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge