Merge branch 'master' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 15 Jul 2014 00:02:07 +0000 (17:02 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 15 Jul 2014 00:02:07 +0000 (17:02 -0700)
commit96b7e5552f6ee0e5d4be527803b6d3009709c3c7
tree3fec00785eb8a76f196d934fa095174eadd3ed13
parentf87608e828f97ff79be39ebaf11ca2647763f2f1
parentd37ba2f14e958e57ed34abe1797c78b4663e211a
Merge branch 'master' into 1.0.x