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)
commit56dd0c41f665a2b70bc2e3f97406386caf034b75
treec12aab445b8f2268956436a79ef9b329bb4dd746
parent3a2788fd321eecfcdd293279dc5a88ac4150ae48
parent69a3339d64e53ddba7bf30099d0fac45113f1e0c
Merge branch '1.0.x'
README.markdown