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

[GitHub]

  Branch: refs/heads/merge4
  Home:   https://github.com/zopefoundation/ZODB
  Commit: 673f0ea8116c1675b40910ba47b23b0605fa40d8
      https://github.com/zopefoundation/ZODB/commit/673f0ea8116c1675b40910ba47b23b0605fa40d8
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py
    M src/ZODB/mvccadapter.py
    M src/ZODB/tests/BasicStorage.py
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/HistoryStorage.py
    M src/ZODB/tests/MTStorage.py
    M src/ZODB/tests/RevisionStorage.py
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/TransactionalUndoStorage.py
    M src/ZODB/tests/testDemoStorage.py

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