[Checkins] [zopefoundation/zodbpickle] 1cf43e: Catch up with the 'errors=bytes' stuff added to th...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zodbpickle
  Commit: 1cf43e834eaec7256a514d7cc7dee701bc501e24
      https://github.com/zopefoundation/zodbpickle/commit/1cf43e834eaec7256a514d7cc7dee701bc501e24
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M src/zodbpickle/_pickle_32.c

  Log Message:
  -----------
  Catch up with the 'errors=bytes' stuff added to the 3.3 pickler.


  Commit: 1ebfb9b3251ec6a9e0f2bf260d9b6a845fe01b68
      https://github.com/zopefoundation/zodbpickle/commit/1ebfb9b3251ec6a9e0f2bf260d9b6a845fe01b68
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Fix merge error.


Compare: https://github.com/zopefoundation/zodbpickle/compare/5d0c194fe025...1ebfb9b3251e