Merge pull request #246 from hunner/buncha_picks
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 25 Feb 2014 17:58:36 +0000 (09:58 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 25 Feb 2014 17:58:36 +0000 (09:58 -0800)
Buncha picks


Trivial merge