From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Thu, 23 Apr 2015 21:48:43 +0000 (+0200)
Subject: Merge pull request #507 from mhaskel/merge_fixes_from_2.0.x
X-Git-Tag: 2.1.0~18
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cf7271d7e60aca6ea265bda55fd99b80b1845186;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #507 from mhaskel/merge_fixes_from_2.0.x

Merge fixes from 2.0.x
---

cf7271d7e60aca6ea265bda55fd99b80b1845186