[Checkins] [zopefoundation/five.pt] 550e88: Preparing release 2.2.5

[GitHub]

  Branch: refs/heads/re-9-deprecate-package
  Home:   https://github.com/zopefoundation/five.pt
  Commit: 550e882c7e0c4e5b5c2c52ab714d2561fdeb7935
      https://github.com/zopefoundation/five.pt/commit/550e882c7e0c4e5b5c2c52ab714d2561fdeb7935
  Author: esteele <eric at esteele.net>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGES.rst
    M setup.py

  Log Message:
  -----------
  Preparing release 2.2.5

[ci skip]


  Commit: 0d02eb9debb32527fe8776beb8842a6ffd6a8e09
      https://github.com/zopefoundation/five.pt/commit/0d02eb9debb32527fe8776beb8842a6ffd6a8e09
  Author: esteele <eric at esteele.net>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGES.rst
    M setup.py

  Log Message:
  -----------
  Back to development: 2.2.6

[ci skip]


  Commit: 23aa77f12b61e49cd9622cd7efbf52d13a4d38b1
      https://github.com/zopefoundation/five.pt/commit/23aa77f12b61e49cd9622cd7efbf52d13a4d38b1
  Author: Michael Howitz <mh at gocept.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M CHANGES.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into re-9-deprecate-package

# Conflicts:
#	CHANGES.rst
#	setup.py


  Commit: fae164967edbd7d45bb9a9975e08e5b08aa903a9
      https://github.com/zopefoundation/five.pt/commit/fae164967edbd7d45bb9a9975e08e5b08aa903a9
  Author: Michael Howitz <mh at gocept.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M CHANGES.rst
    M setup.py

  Log Message:
  -----------
  Improve PR.


Compare: https://github.com/zopefoundation/five.pt/compare/d299a9b3eec3...fae164967edb