[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/4a0ecfe0a907
changeset:   85497:4a0ecfe0a907
parent:      85495:25211a22228b
parent:      85496:43f27e69bc29
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Sep 01 19:04:18 2013 -0400
summary:
  Merge with 3.3

files:
  .hgeol |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -26,7 +26,6 @@
 **.xar  = BIN
 **.zip  = BIN
 
-Lib/email/test/data/msg_26.txt = BIN
 Lib/test/cjkencodings/* = BIN
 Lib/test/decimaltestdata/*.decTest = BIN
 Lib/test/sndhdrdata/sndhdr.* = BIN

-- 
Repository URL: http://hg.python.org/cpython