summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-03-29 23:20:32 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-03-29 23:20:32 -0700
commit56092811b5c12725be3652534a59334303719608 (patch)
tree0a5d35af136796a5cd870191be9f6d7daea8fac6 /lib
parent6065628493e775e3e6ddb59f272bd36a9e9fe072 (diff)
parent69465b0f3e0c0c5284812bfa76ab8d3c254d10a9 (diff)
Merge branch '2.2.x' into 2.3.x
* 2.2.x: (#13439) Fix MRI 1.9 issue with spec_helper
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions