From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 13 Sep 2013 13:27:52 +0000 (-0700)
Subject: Merge for Issue #18997: Issue #18997: fix ElementTree crash with using pickle and... 
X-Git-Tag: v3.4.0a3~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12f18289c0481ffc1731dfa606baa9f65baa6478;p=thirdparty%2FPython%2Fcpython.git

Merge for Issue #18997: Issue #18997: fix ElementTree crash with using pickle and __getstate__.
---

12f18289c0481ffc1731dfa606baa9f65baa6478
diff --cc Misc/ACKS
index be488d63b800,9781600b2c06..17d2e75e59e6
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -154,10 -150,9 +154,11 @@@ Monty Brandenber
  Georg Brandl
  Christopher Brannon
  Terrence Brannon
+ Germán M. Bravo
 +Sven Brauch
  Erik Bray
  Brian Brazil
 +Demian Brecht
  Dave Brennan
  Tom Bridgman
  Anthony Briggs