Merge pull request #280 from bmjen/fix-changelog
authorMorgan Rhodes <morgan@puppetlabs.com>
Fri, 4 Dec 2015 22:12:41 +0000 (14:12 -0800)
committerMorgan Rhodes <morgan@puppetlabs.com>
Fri, 4 Dec 2015 22:12:41 +0000 (14:12 -0800)
(maint) Another update to the CHANGELOG


Trivial merge