diff options
author | James Turnbull <james@lovedthanlost.net> | 2008-05-20 19:06:45 +1000 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2008-05-20 19:06:45 +1000 |
commit | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (patch) | |
tree | ec46287a86ce738fec5774347ea4f9afcf804953 /install.rb | |
parent | 390db8061ae81174ee9d42e26a6ebfe7182ea529 (diff) | |
parent | ee4be4f78f7c904dbe5873ff7b44993d1440da41 (diff) | |
download | puppet-84a787a2a764a5035f7cbb8d30f94fc601bed154.tar.gz puppet-84a787a2a764a5035f7cbb8d30f94fc601bed154.tar.xz puppet-84a787a2a764a5035f7cbb8d30f94fc601bed154.zip |
Merge branch '0.24.x' of git://github.com/lak/puppet into 0.24.x
Conflicts:
CHANGELOG
Diffstat (limited to 'install.rb')
0 files changed, 0 insertions, 0 deletions