summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2011-08-01 11:48:50 -0700
committerJeff McCune <jeff@puppetlabs.com>2011-08-01 11:48:50 -0700
commit66cfee6f22e474b05dc1d6001a6e1636d8c33bf1 (patch)
tree3d21a63153af0fd6845801344ad71adf7b35b310 /LICENSE
parent2e3d49d17448ae799c88470f2bb5b09d463bbe22 (diff)
parent4725c97102e1013e212b76b349a97f9dda51fabc (diff)
downloadpuppet-stdlib-66cfee6f22e474b05dc1d6001a6e1636d8c33bf1.tar.gz
puppet-stdlib-66cfee6f22e474b05dc1d6001a6e1636d8c33bf1.tar.bz2
Merge branch 'ticket/master/8717_merge_function_ruby_185'
* ticket/master/8717_merge_function_ruby_185: (#8717) Make merge() function work with Ruby 1.8.5
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions