From: Jeff McCune <jeff@puppetlabs.com>
Date: Fri, 30 Dec 2011 19:48:21 +0000 (-0800)
Subject: Merge branch 'v2.1.x' into v2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=80c9a8feeae6203026f61215e100e95078c61a04;p=puppet-stdlib.git

Merge branch 'v2.1.x' into v2.2.x

* v2.1.x:
  (maint) Add semantic versioning info to README
  Docs: Clarify the use case for the anchor type
  Docs: Remove author emails from stdlib functions
  Docs: Copyedit function doc strings
  Docs: Correct indentation of markdown code examples
  Docs: Update documentation of stdlib classes
  Docs: Update file_line documentation
  Docs: Improve example in merge function
---

80c9a8feeae6203026f61215e100e95078c61a04