]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit66cfee6f22e474b05dc1d6001a6e1636d8c33bf1
tree3d21a63153af0fd6845801344ad71adf7b35b310
parent2e3d49d17448ae799c88470f2bb5b09d463bbe22
parent4725c97102e1013e212b76b349a97f9dda51fabc
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