From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Mon, 27 Oct 2014 15:54:24 +0000 (-0700)
Subject: Merge pull request #377 from mhaskel/1.7.x-merge
X-Git-Tag: 1.7.0~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7c71390cd15facf38ef7cc5718205d6811b936b6;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #377 from mhaskel/1.7.x-merge

Merge master back into 1.7.x
---

7c71390cd15facf38ef7cc5718205d6811b936b6