Merge pull request #1154 from bastelfreak/stdlib

replace deprecated merge() with native puppet code

Author: bastelfreak

manifests/source.pp

@@ -144,7 +144,7 @@
       }
       if $key['id'] {
         # defaults like keyserver are only relevant to apt::key
-        $_key = merge($apt::source_key_defaults, $key)
+        $_key = $apt::source_key_defaults + $key
       } else {
         $_key = $key
       }