Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 22 Jul 2015 23:27:54 +0000 (16:27 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 22 Jul 2015 23:27:54 +0000 (16:27 -0700)
commitbea5567ec2a2d5d1420f61a63d0e672693f6adcd
tree39b1bb255ceee413275b6aa789f8d3382c21399f
parent88eb872e450d54986c1de7aed9ee22b362ceb729
parentfa86d8ed5052407f9279c308c2a9079599380bf8
Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x