]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'ticket/master/8717_merge_function_ruby_185'
authorJeff McCune <jeff@puppetlabs.com>
Mon, 1 Aug 2011 18:48:50 +0000 (11:48 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 1 Aug 2011 18:48:50 +0000 (11:48 -0700)
* ticket/master/8717_merge_function_ruby_185:
  (#8717) Make merge() function work with Ruby 1.8.5


Trivial merge