Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 19 Jun 2014 19:29:31 +0000 (12:29 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 19 Jun 2014 19:29:31 +0000 (12:29 -0700)
commite42310c7fb082a20f4155d801e41b980400ae045
tree4c7f1a871a24ca7dbc0378cb17abcc5186952b45
parent5a61e814677859661b473cea31c51ab8e43cb11c
parent84aac457692c18512baab28c8eae00998a7cf9a4
Merge branch '1.0.x'