Merge pull request #325 from apenney/merge
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 3 Jul 2014 17:10:10 +0000 (10:10 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 3 Jul 2014 17:10:10 +0000 (10:10 -0700)
commitb764779fa4b1616fb480c3e91df2737ac5b1faab
tree1330a1c722ec078cc82def7b53bd00cb055e3db9
parent98d16464c32d17e449cc12dd2406654afe81f397
parent3c48598eebbd3d62bcec69893b652dc0b71cecb7
Merge pull request #325 from apenney/merge

Merge