merge 3.2

This commit is contained in:
Benjamin Peterson 2011-07-03 13:50:16 -05:00
commit ffada78059
1 changed files with 1 additions and 1 deletions

View File

@ -11,7 +11,7 @@ Core and Builtins
----------------- -----------------
- Issue #12475: Prevent generators from leaking their exception state into the - 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, - Issue #12291: You can now load multiple marshalled objects from a stream,
with other data interleaved between marshalled objects. with other data interleaved between marshalled objects.