Merge remote-tracking branch 'upstream/1.2.x' into test
authorMorgan Haskel <morgan@puppetlabs.com>
Tue, 4 Nov 2014 23:02:33 +0000 (15:02 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Tue, 4 Nov 2014 23:02:33 +0000 (15:02 -0800)
commit213be2e666c9b3ddff53a0228b023b1027bca820
treee59b2d670a09bc1250cfc30ccd5a61baecd85c98
parent5da0edb4149dc78e7a6408791aeeeb9d823550e5
parentec940cff5ba4640c43e1cdfd46891a519f94c7c3
Merge remote-tracking branch 'upstream/1.2.x' into test