diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-10-18 16:11:17 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-10-18 16:11:17 -0700 |
| commit | 7e35d98964b3534281b3d1f164e548a86fce18dd (patch) | |
| tree | c4317404d5ae52ddeb816997d2a2251e2f9e5b95 /spec | |
| parent | f4da5285f1cedfed476eed37d40e1404e2801c48 (diff) | |
| parent | d62b01394888c0aefa87aa10f51d3bf21363300d (diff) | |
| parent | 1125e1e050a3807df2ada4d8cf2d36c22a75ed2b (diff) | |
| download | facter-7e35d98964b3534281b3d1f164e548a86fce18dd.tar.gz facter-7e35d98964b3534281b3d1f164e548a86fce18dd.tar.xz facter-7e35d98964b3534281b3d1f164e548a86fce18dd.zip | |
Merge remote branches 'pnasrat/tickets/master/4889' and 'pnasrat/tickets/master/4956' into next