Merge branch '1.1.x'
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 15 Sep 2014 20:41:04 +0000 (13:41 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 15 Sep 2014 20:41:04 +0000 (13:41 -0700)
commit8a414d13cc7122543047d9cb27c9eaa9cf42663f
treefd2943bd218675c6a48ffd9baa75f5ae921642bc
parentdd23c0ea664cc9492c186e7afc221953f2ab3abe
parent9d5cac15858a860618e715e068f1c0bdf5b71c58
Merge branch '1.1.x'
spec/spec_helper_acceptance.rb