Merge pull request #360 from mhaskel/test
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 15 Sep 2014 21:27:27 +0000 (14:27 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 15 Sep 2014 21:27:27 +0000 (14:27 -0700)
commit622a05ab88fd6bf9c3310294f45bbf9a6e95d3ac
tree098a71cf7666e1fc11d02ae22f7ff23f5f089332
parentdf8f80aedbb044a6d7783512d0e3c98160c6b238
parent6540b7ba245207ab1e4832dff9c31a480dddf33f
Merge pull request #360 from mhaskel/test

Merge 1.6.x into master