Merge pull request #576 from puppetlabs/2.2.x
authorDavid Schmitt <david.schmitt@puppetlabs.com>
Tue, 8 Dec 2015 15:09:12 +0000 (15:09 +0000)
committerDavid Schmitt <david.schmitt@puppetlabs.com>
Tue, 8 Dec 2015 15:09:12 +0000 (15:09 +0000)
commit72528a014c8ffc87938097b15c86311e0a0294f2
tree271aaa151d359f303fb5f5dd2e2ca637fb4f07ad
parent99ea865f43fe22c4828dea2457aeda9dbf909e7f
parent61804c0324d2bb30054dd60d93d9f13109c6f21d
Merge pull request #576 from puppetlabs/2.2.x

Mergeback 2.2.x