From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 16 Jun 2015 22:21:41 +0000 (-0700)
Subject: Merge pull request #535 from mhaskel/merge_2.1.x_to_master
X-Git-Tag: 2.2.0~18
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b2e6ba8781408992038a3457877841a315762460;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #535 from mhaskel/merge_2.1.x_to_master

Merge 2.1.x to master
---

b2e6ba8781408992038a3457877841a315762460