diff options
author | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
commit | 1deb7fd487dca1046beb933dca2cccadf44fa6f5 (patch) | |
tree | 06343d67499adecb28c4465fd15c92ad9336e109 /test/util/autoload.rb | |
parent | f3fd7091d3db9dff1b177867589289890e9a3a66 (diff) | |
parent | c4ed43c2a1ad9ab865e3da6b8b7fad28222c3451 (diff) | |
download | puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.gz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.xz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.zip |
Merge branch '0.24.x'
Conflicts:
conf/redhat/puppet.spec
Diffstat (limited to 'test/util/autoload.rb')
0 files changed, 0 insertions, 0 deletions