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)

Trivial merge