From: Jeff McCune Date: Mon, 1 Aug 2011 18:48:50 +0000 (-0700) Subject: Merge branch 'ticket/master/8717_merge_function_ruby_185' X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=66cfee6f22e474b05dc1d6001a6e1636d8c33bf1;p=puppet-stdlib.git 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 --- 66cfee6f22e474b05dc1d6001a6e1636d8c33bf1