Merge 3.3.x to master#684
Merged
cmurphy merged 5 commits intopuppetlabs:masterfrom Mar 3, 2015
Commits
Commits on Mar 2, 2015
- committedMorgan Haskel
- committedMorgan Haskel
- committed
- authored andjbondpdxcommittedMorgan Haskel
- committedMorgan Haskel