merge heads

This commit is contained in:
Benjamin Peterson 2012-03-17 00:05:59 -05:00
commit d845450eef

View file

@ -30,6 +30,9 @@ Core and Builtins
Library
-------
- Issue #11686: Added missing entries to email package __all__ lists
(mostly the new Bytes classes).
- Issue #14335: multiprocessing's custom Pickler subclass now inherits from
the C-accelerated implementation. Patch by sbt.