From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 30 Aug 2012 21:57:55 +0000 (-0700)
Subject: Merge branch '3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6961179007dce76d7fb9bd1fc361273acb4129a7;p=puppet-stdlib.git

Merge branch '3.x'

* 3.x:
  (Maint) Remove core function documentation from README

Conflicts:
	README.markdown
---

6961179007dce76d7fb9bd1fc361273acb4129a7