]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be46f0e 49acade)
Merge pull request #388 from mhaskel/merge_4.5.x_into_master
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 18 Dec 2014 23:55:33 +0000 (15:55 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 18 Dec 2014 23:55:33 +0000 (15:55 -0800)
Merge 4.5.x into master

1  2 
README.markdown patch | diff1 | diff2 | blob | history

diff --cc README.markdown
Simple merge
Puppet module for stdlib