Merge branch 'load-calls-loadBefore' of github.com:zopefoundation/ZOD…

…B into load-calls-loadBefore

Conflicts:
	src/ZODB/utils.py

CHANGES.rst

@@ -2,7 +2,12 @@
  Change History
 ================
 
-4.3.0 (unreleased)
+4.3.1 (2016-06-06)
+==================
+
+- Fixed: FileStorage loadBefore didn't handle deleted/undone data correctly.
+
+4.3.0 (2016-05-31)
 ==================
 
 - Drop support for Python 2.6 and 3.2.
@@ -29,7 +34,7 @@
 - DemoStorage: add support for conflict resolution and fix history()
   https://github.com/zopefoundation/ZODB/pull/58
 
-- Fixed: FileStorage loadBefore didn't handle deleted/undone data correctly.
+- Fixed a test that depended on implementation-specific behavior in tpc_finish
 
 4.2.0 (2015-06-02)
 ==================

setup.py

@@ -20,13 +20,12 @@
 interface, rich transaction support, and undo.
 """
 
-version = "4.3.0.dev0"
+version = "5.0.dev0"
 
 import os
 from setuptools import setup, find_packages
 
 classifiers = """\
-Development Status :: 4 - Beta
 Intended Audience :: Developers
 License :: OSI Approved :: Zope Public License
 Programming Language :: Python
@@ -131,7 +130,7 @@ def read_file(*path):
       license = "ZPL 2.1",
       platforms = ["any"],
       description = doclines[0],
-      classifiers = filter(None, classifiers.split("\n")),
+      classifiers = list(filter(None, classifiers.split("\n"))),
       long_description = long_description,
       test_suite="__main__.alltests", # to support "setup.py test"
       tests_require = tests_require,
@@ -142,7 +141,7 @@ def read_file(*path):
         'persistent >= 4.2.0',
         'BTrees >= 4.2.0',
         'ZConfig',
-        'transaction >= 1.5.0',
+        'transaction >= 1.6.1',
         'six',
         'zc.lockfile',
         'zope.interface',