]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22379)
authorBenjamin Peterson <benjamin@python.org>
Sun, 28 Sep 2014 16:57:22 +0000 (12:57 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 28 Sep 2014 16:57:22 +0000 (12:57 -0400)
1  2 
Lib/test/string_tests.py
Lib/test/test_bytes.py
Misc/ACKS

Simple merge
Simple merge
diff --cc Misc/ACKS
Simple merge