From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 28 Jul 2015 15:40:30 +0000 (+0100)
Subject: Merge pull request #553 from bmjen/2.1.x_mergeback
X-Git-Tag: 2.2.0~7
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f05e43c28588a280a42333f9ca3a506a7121849d;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #553 from bmjen/2.1.x_mergeback

2.1.x mergeback
---

f05e43c28588a280a42333f9ca3a506a7121849d