merge 3.2

ffada780 · Benjamin Peterson · 7b7099c3 · 9cf960c9 · ffada780
Kaydet (Commit) ffada780 authored Tem 03, 2011 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

NEWS Misc/NEWS +1 -1

No files found.
--- 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.