summaryrefslogtreecommitdiff
path: root/spec/spec.opts
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:06:07 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:06:07 -0700
commitc12d3d7d51da4107f5e0b63aacc4fcb2c5923a0b (patch)
tree70aa214ad4e4f8532347a8bff1ca9484e1ed288e /spec/spec.opts
parent4fdefd07617a23797ada6aa0eb1a5dadd5b9bd43 (diff)
parent967f9916d16ea4f5a8557c9c66ddb878872337ca (diff)
downloadpuppet-stdlib-c12d3d7d51da4107f5e0b63aacc4fcb2c5923a0b.tar.gz
puppet-stdlib-c12d3d7d51da4107f5e0b63aacc4fcb2c5923a0b.tar.bz2
Merge branch '2.x' into 3.x
Diffstat (limited to 'spec/spec.opts')
0 files changed, 0 insertions, 0 deletions