don't fail on undef variable in merge#147

Merged

adrienthebo merged 5 commits intopuppetlabs:masterfrom

mhellmic:master

May 15, 2013

Commits on Feb 18, 2013

changed .count to .size to support legacy ruby
Martin Hellmich
committed

Commits on Apr 22, 2013

Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib
mhellmic
committed
check if an argument supposed to be merged is empty to
mhellmic
committed

Commits on May 8, 2013

fix in merge.rb: refine the checking if an argument is an empty string
mhellmic
committed
Added rspec tests for the new behaviour of merge accepting empty strings
mhellmic
committed