merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Mar 2014 00:16:51 +0000 (19:16 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Mar 2014 00:16:51 +0000 (19:16 -0500)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge