From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 29 Jul 2011 22:42:53 +0000 (-0700)
Subject: Merge branch 'feature/master/add_merge_has_key'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2e3d49d17448ae799c88470f2bb5b09d463bbe22;p=puppet-stdlib.git

Merge branch 'feature/master/add_merge_has_key'
---

2e3d49d17448ae799c88470f2bb5b09d463bbe22