diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-10-05 10:33:12 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-10-05 10:33:12 -0700 |
| commit | 74ce28698714acace4d588a7639bd8bd70144f3a (patch) | |
| tree | f975697c035adb40ec3249517e7d396a0a53fb05 /ext/facter-diff | |
| parent | 524000fc69031608c145d805f7b101af4dfacef0 (diff) | |
| parent | b8b7123a3170afd73723ea386b95ba01c0f23279 (diff) | |
| parent | b5c85de39edbb083d562dafd96fe507fbcd2f43d (diff) | |
Merge branches 'feature/master/4567' and 'feature/master/4563' into next