[Checkins] [zopefoundation/plone.z3cform] dc30c8: Allowed union merge strategy in CHANGES.rst.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/plone.z3cform
  Commit: dc30c8b7ada1b1e88cf85c58b29e8e0badef5c5a
      https://github.com/zopefoundation/plone.z3cform/commit/dc30c8b7ada1b1e88cf85c58b29e8e0badef5c5a
  Author: Maurits van Rees <maurits at vanrees.org>
  Date:   2015-10-25 (Sun, 25 Oct 2015)

  Changed paths:
    A .gitattributes
    M .gitignore

  Log Message:
  -----------
  Allowed union merge strategy in CHANGES.rst.

[ci skip]