merge 3.2

2011-07-03 13:50:16 -05:00 · 2011-07-03 13:50:16 -05:00 · ffada78059
parent 7b7099c36f 9cf960c94f
commit ffada78059
1 changed files with 1 additions and 1 deletions
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -11,7 +11,7 @@ Core and Builtins
 -----------------

 - Issue #12475: Prevent generators from leaking their exception state into the
-  callers frame as they return for the last time.
+  caller's frame as they return for the last time.

 - Issue #12291: You can now load multiple marshalled objects from a stream,
  with other data interleaved between marshalled objects.