Merge branch '1.6.x' into test
authorMorgan Haskel <morgan@puppetlabs.com>
Fri, 12 Sep 2014 21:24:49 +0000 (17:24 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Fri, 12 Sep 2014 21:24:49 +0000 (17:24 -0400)
commit6540b7ba245207ab1e4832dff9c31a480dddf33f
tree098a71cf7666e1fc11d02ae22f7ff23f5f089332
parentdf8f80aedbb044a6d7783512d0e3c98160c6b238
parent6a95ab6156e4fb4ad339b2a6476a98aa9605c32f
Merge branch '1.6.x' into test
spec/spec_helper_acceptance.rb