]> granicus.if.org Git - python/commitdiff
merge 3.4 (#12063)
authorBenjamin Peterson <benjamin@python.org>
Sun, 8 Jun 2014 00:55:53 +0000 (17:55 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 8 Jun 2014 00:55:53 +0000 (17:55 -0700)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge