From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 23 Jul 2012 16:00:11 +0000 (-0700)
Subject: Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f3caf5f49383344228482b93ad533d06244a3cac;p=puppet-stdlib.git

Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x

* 2.2.x:
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
---

f3caf5f49383344228482b93ad533d06244a3cac