[Checkins] [zopefoundation/ZODB] 36d7ac: *** empty log message ***

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/ZODB
  Commit: 36d7ac9ce0506f7ef215c67cd3a92c1ba9d29dc6
      https://github.com/zopefoundation/ZODB/commit/36d7ac9ce0506f7ef215c67cd3a92c1ba9d29dc6
  Author: Jim Fulton <jim at zope.com>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  *** empty log message ***


  Commit: 79f7f4ac6d1bf2f1f7930727495459b8847c1c31
      https://github.com/zopefoundation/ZODB/commit/79f7f4ac6d1bf2f1f7930727495459b8847c1c31
  Author: Jim Fulton <jim at zope.com>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  4.0.1


  Commit: 67aae9fbac98144dd74f63a25da2e8910f122625
      https://github.com/zopefoundation/ZODB/commit/67aae9fbac98144dd74f63a25da2e8910f122625
  Author: Jim Fulton <jim at zope.com>
  Date:   2015-01-11 (Sun, 11 Jan 2015)

  Changed paths:
    M .gitignore
    M .travis.yml
    M CHANGES.rst
    M MANIFEST.in
    M bootstrap.py
    M setup.py
    M src/ZODB/loglevels.py
    M src/ZODB/scripts/fsrefs.py
    M src/ZODB/scripts/netspace.py
    M src/ZODB/scripts/repozo.py
    M src/ZODB/tests/testDB.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:zopefoundation/ZODB

Conflicts:
	CHANGES.rst
	setup.py


Compare: https://github.com/zopefoundation/ZODB/compare/2d6773cd059e...67aae9fbac98