diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
| commit | fe157f239a301abb52f81c62719355c8e50c970c (patch) | |
| tree | 2ff683d14dbf5c95a99410fe1d12300368cf497e /man/man8/puppetdoc.8 | |
| parent | 3cb0d60d3d0870f1d9ac83e5dbeaa06d2888231f (diff) | |
| parent | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (diff) | |
| download | puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.gz puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.xz puppet-fe157f239a301abb52f81c62719355c8e50c970c.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
spec/integration/defaults.rb
spec/integration/node/catalog.rb
spec/unit/rails.rb
spec/unit/type/mount.rb
Diffstat (limited to 'man/man8/puppetdoc.8')
| -rw-r--r-- | man/man8/puppetdoc.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8 index d7aacee75..8303b7ae0 100644 --- a/man/man8/puppetdoc.8 +++ b/man/man8/puppetdoc.8 @@ -58,5 +58,5 @@ Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License -.\" Generated by docutils manpage writer on 2008-03-22 17:46. +.\" Generated by docutils manpage writer on 2008-05-05 09:33. .\" |