]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'feature/master/add_merge_has_key'
authorDan Bode <dan@puppetlabs.com>
Fri, 29 Jul 2011 22:42:53 +0000 (15:42 -0700)
committerDan Bode <dan@puppetlabs.com>
Fri, 29 Jul 2011 22:42:53 +0000 (15:42 -0700)

Trivial merge