[Checkins] [zopefoundation/ZODB] c9726c: Merge 4.x branch

[GitHub]

  Branch: refs/heads/merge4
  Home:   https://github.com/zopefoundation/ZODB
  Commit: c9726cb5ffd0a89ffd4093db52d9e1b46f7bd9e4
      https://github.com/zopefoundation/ZODB/commit/c9726cb5ffd0a89ffd4093db52d9e1b46f7bd9e4
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/ConflictResolution.py
    M src/ZODB/fstools.py
    M src/ZODB/scripts/fstail.py
    M src/ZODB/scripts/tests/fstail.txt
    M src/ZODB/scripts/tests/test_doc.py
    M src/ZODB/tests/TransactionalUndoStorage.py

  Log Message:
  -----------
  Merge 4.x branch