Closes #17202: Merge with 3.4

This commit is contained in:
Zachary Ware 2015-04-13 12:11:40 -05:00
commit 774ac377da
29 changed files with 1040 additions and 1037 deletions

3
.hgeol
View File

@ -40,6 +40,9 @@ Lib/venv/scripts/nt/* = BIN
Lib/test/coding20731.py = BIN
# Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF
# All other files (which presumably are human-editable) are "native".
# This must be the last rule!