Merge pull request #593 from puppetlabs/2.2.x
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 29 Feb 2016 21:52:36 +0000 (13:52 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 29 Feb 2016 21:52:36 +0000 (13:52 -0800)
commit1e45278668b878b7800719838ae659d6f9efc0ff
treeec851599147912062b3ae930ce746b38dba26c7e
parentf2a78eae72f76ed1fd6e1f2c0ccff68cfa12a176
parenteee0a6b1e71a34321a67eb78608fc716c1ff739a
Merge pull request #593 from puppetlabs/2.2.x

Mergeback 2.2.x