Merge pull request #489 from mhaskel/2.0.0-prep
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 14 Apr 2015 18:19:40 +0000 (11:19 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 14 Apr 2015 18:19:40 +0000 (11:19 -0700)
commit33c296b963a433c6fe5584b0fd1148c7330c69d0
treec251f971b9b6a00527fb3cd6399e60c22327c43d
parentdc79ae5020928004f0a640f060736d60d6877749
parent94976bbd7ca6100c1fb7c1aeb773a7b5b16cbf4b
Merge pull request #489 from mhaskel/2.0.0-prep

2.0.0 prep