Merge upstream changes into readme branch
authorPete Soloway <pete@puppetlabs.com>
Tue, 21 Apr 2015 20:56:15 +0000 (13:56 -0700)
committerPete Soloway <pete@puppetlabs.com>
Tue, 21 Apr 2015 20:56:15 +0000 (13:56 -0700)
commit5998ab9ad89ca7c2926cef4b09f46e954f734aea
tree6fd839df10c93a80332e64b3e71d02d3c6d5516e
parentb1e0a48fa095aac7d2aea01f616a164890a10c2d
parent7aab800dff04c485308edd906ce234e83ffb154e
Merge upstream changes into readme branch
README.markdown