Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Fri, 27 Jun 2014 21:40:33 +0000 (14:40 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Fri, 27 Jun 2014 21:40:33 +0000 (14:40 -0700)
1  2 
README.markdown

diff --cc README.markdown
Simple merge