From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 17 Aug 2011 23:38:14 +0000 (-0700)
Subject: Merge branch 'v2.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e6d62cde42084f283e56e192043a04f7882a4b99;p=puppet-stdlib.git

Merge branch 'v2.x'

* v2.x:
  Update CHANGELOG, Modulefile and README for 2.1.0
  (#9080) Add facts from /etc/puppetlabs/facts.d
---

e6d62cde42084f283e56e192043a04f7882a4b99