]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21404)
authorBenjamin Peterson <benjamin@python.org>
Sat, 7 Jun 2014 19:48:09 +0000 (12:48 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 7 Jun 2014 19:48:09 +0000 (12:48 -0700)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge