Merge branch 'master' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 17:15:28 +0000 (10:15 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 17:15:28 +0000 (10:15 -0700)
commit51bea5e925e45af23aec670113d66eb9c4145e3c
tree3c46b88ad3672590152e224d35163c03ecccc72d
parenta3599a47c49ff9ebee334ec88346fd78b9b278b9
parentd23a098c2deba9fb79ca53e2d51a8177b0f071af
Merge branch 'master' into 1.0.x