summaryrefslogtreecommitdiff
path: root/README.markdown
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 11:11:11 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 11:11:11 -0700
commit7d8df4b99829d2afe1b13d667bb2e0fbd0374412 (patch)
tree40bb15194a6b334cf9ca2439c3cfa65d5d71ab3c /README.markdown
parenta748735f4637089dbbee7920b70f5a7033148c0c (diff)
parent88af331b0e9b0e8c8a3c1e74e4c5598dc7b8e1c8 (diff)
downloadpuppet-stdlib-7d8df4b99829d2afe1b13d667bb2e0fbd0374412.tar.gz
puppet-stdlib-7d8df4b99829d2afe1b13d667bb2e0fbd0374412.tar.bz2
Merge branch '2.5.x'
* 2.5.x: Update Modulefile, CHANGELOG for 2.5.0 Conflicts: CHANGELOG Modulefile
Diffstat (limited to 'README.markdown')
0 files changed, 0 insertions, 0 deletions