Merge pull request #258 from mhaskel/1.3.1-prep
authorHunter Haugen <hunter@puppetlabs.com>
Fri, 24 Jul 2015 22:35:56 +0000 (15:35 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Fri, 24 Jul 2015 22:35:56 +0000 (15:35 -0700)
1.3.1 prep


Trivial merge