[Checkins] [zopefoundation/z3c.autoinclude] a9cdc0: Allowed union merge strategy in CHANGES.rst.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/z3c.autoinclude
  Commit: a9cdc0a5ebb7c3659e0d0828fe43adc21463ecec
      https://github.com/zopefoundation/z3c.autoinclude/commit/a9cdc0a5ebb7c3659e0d0828fe43adc21463ecec
  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]