puppetlabs/puppet — pull request #3334 by ffrank (2014-11-25 00:03:54+00:00)
Title: (maint) Cleanup of environment code after PUP-3341 fix

Just one commit, based on #3321.