Merge pull request #515 from mhaskel/merge_2.0.x_to_master
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 29 Apr 2015 17:23:32 +0000 (10:23 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 29 Apr 2015 17:23:32 +0000 (10:23 -0700)
commit55a17ac5916110ad996e85af05a18fbdf21a90d5
tree549237b4a206124001f1988d5901c03f99b7b338
parentcf7271d7e60aca6ea265bda55fd99b80b1845186
parentf2c3956fd12ff980615cdc07b9ff884b31af2f58
Merge pull request #515 from mhaskel/merge_2.0.x_to_master

Merge 2.0.x to master