puppetlabs/puppet — pull request #778 by kelseyhightower (2012-05-14 22:44:03+00:00)
Title: (maint) Manually resolve broken merge of 2.7.x

This patch resolves a merge conflict with 2.7.x, mainly around some
changes in the PMT installer face options.