[Checkins] [zopefoundation/zc.lockfile] 0dc1ed: 1.2.1

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zc.lockfile
  Commit: 0dc1ed12d78d872d9f252b518b7cd086423c9992
      https://github.com/zopefoundation/zc.lockfile/commit/0dc1ed12d78d872d9f252b518b7cd086423c9992
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M CHANGES.txt
    M setup.py

  Log Message:
  -----------
  1.2.1


  Commit: eb02cc67aff318d5bee609865301c531c931fbe6
      https://github.com/zopefoundation/zc.lockfile/commit/eb02cc67aff318d5bee609865301c531c931fbe6
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-08-03 (Wed, 03 Aug 2016)

  Changed paths:
    M .travis.yml
    M CHANGES.txt
    M setup.py
    M tox.ini

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

Conflicts:
	CHANGES.txt
	setup.py


Compare: https://github.com/zopefoundation/zc.lockfile/compare/f19a58248165...eb02cc67aff3