From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Tue, 16 Dec 2014 18:17:24 +0000 (-0800)
Subject: Merge pull request #384 from mhaskel/doc_fixes_from_master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1493b212f24ef704f63b90fd6592b61c36cb3210;p=puppet-stdlib.git

Merge pull request #384 from mhaskel/doc_fixes_from_master

Doc fixes from master
---

1493b212f24ef704f63b90fd6592b61c36cb3210