]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge remote-tracking branch 'origin/4.3.x' back to master
authorTravis Fields <travis@puppetlabs.com>
Tue, 28 Oct 2014 22:31:37 +0000 (15:31 -0700)
committerTravis Fields <travis@puppetlabs.com>
Tue, 28 Oct 2014 22:31:37 +0000 (15:31 -0700)
1  2 
spec/spec_helper_acceptance.rb

Simple merge