puppetlabs/puppet — pull request #2787 by Iristyle (2014-06-19 21:22:03+00:00)
Title: WIP - DO NOT MERGE

Builds on #2776