From: Morgan Haskel Date: Wed, 22 Jul 2015 23:27:54 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x X-Git-Tag: 2.1.1~2^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bea5567ec2a2d5d1420f61a63d0e672693f6adcd;p=puppet-modules%2Fpuppetlabs-apt.git Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x --- bea5567ec2a2d5d1420f61a63d0e672693f6adcd