From: Patrick Carlisle <patrick@puppetlabs.com>
Date: Thu, 9 Aug 2012 22:22:13 +0000 (-0700)
Subject: Merge branch '2.4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=659704831ee9a4d3c83410010884405bdfde7e89;p=puppet-stdlib.git

Merge branch '2.4.x'

* 2.4.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (#2157) Make facts_dot_d compatible with external facts

Conflicts:
	lib/facter/facter_dot_d.rb
---

659704831ee9a4d3c83410010884405bdfde7e89