diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-05-11 00:03:31 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-05-11 00:03:31 -0700 |
| commit | b4343e67fdbdfb7c1aad695187fbce612888a3ba (patch) | |
| tree | 057e18ef030923075e26decb6710f90f3c1ba396 /lib | |
| parent | beaa812e107d41418586af3fc81b4c8ab2d73c07 (diff) | |
| parent | 7d3433345e5c4a35b340f628cd7d7015aadfa9a4 (diff) | |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
Fix spec tests using the new spec_helper
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions