Merge branch 'psoloway-readme' into 1.3.x
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 18 May 2015 21:17:11 +0000 (14:17 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 18 May 2015 21:17:11 +0000 (14:17 -0700)
commite94d67588b368ae51671d777e0f0e53d24e28dea
tree91b4dcb94e626a546a3956eda3585eb318f04465
parent3d3220033fd8be6d7314f995a087d72654d4b8cd
parentf900efd909155c7a9c1d6d74f63d9e919436ccec
Merge branch 'psoloway-readme' into 1.3.x