From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 3 Jul 2014 17:08:11 +0000 (-0400)
Subject: Merge branch '1.5.x' into merge
X-Git-Tag: 1.6.0~14^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3c48598eebbd3d62bcec69893b652dc0b71cecb7;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch '1.5.x' into merge

Conflicts:
	Gemfile
	spec/acceptance/apt_key_provider_spec.rb
---

3c48598eebbd3d62bcec69893b652dc0b71cecb7