Merge pull request #704 from puppetlabs/release
authorEric Putnam <putnam.eric@gmail.com>
Mon, 25 Sep 2017 22:33:08 +0000 (15:33 -0700)
committerGitHub <noreply@github.com>
Mon, 25 Sep 2017 22:33:08 +0000 (15:33 -0700)
(maint) Update release merge back

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge