From: Adrien Thebo <git@somethingsinistral.net>
Date: Wed, 15 May 2013 17:58:04 +0000 (-0700)
Subject: Merge pull request #147 from mhellmic/master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dad3a2948fb9ebc5c45975340bc8796c9c041d9a;p=puppet-stdlib.git

Merge pull request #147 from mhellmic/master

don't fail on undef variable in merge
---

dad3a2948fb9ebc5c45975340bc8796c9c041d9a