From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 29 Apr 2015 17:23:32 +0000 (-0700)
Subject: Merge pull request #515 from mhaskel/merge_2.0.x_to_master
X-Git-Tag: 2.1.0~17
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=55a17ac5916110ad996e85af05a18fbdf21a90d5;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #515 from mhaskel/merge_2.0.x_to_master

Merge 2.0.x to master
---

55a17ac5916110ad996e85af05a18fbdf21a90d5