Merge remote-tracking branch 'laurenrother/readme' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)
commitc604c43ef89b8bc181c3016c907fc6584d566f67
tree22edb6816dd4e33c435758bf6fe57165b0908e0d
parentecb4ad6a1ddd77ab7b6772e96e0f787c03c3f27a
parent8e4a9d2201c73fdd8d2601fcdec64f4089dbdb8f
Merge remote-tracking branch 'laurenrother/readme' into 1.0.x