From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 21 Nov 2014 16:59:04 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x
X-Git-Tag: 1.8.0~34^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e5338f2e53bb47842576e1a2a4391335777e8271;p=puppet-modules%2Fpuppetlabs-apt.git

Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x

Conflicts:
	lib/facter/apt_package_updates.rb
	lib/facter/apt_security_updates.rb
	lib/facter/apt_updates.rb
---

e5338f2e53bb47842576e1a2a4391335777e8271