From: Travis Fields <cyberious@users.noreply.github.com>
Date: Fri, 21 Nov 2014 20:05:48 +0000 (-0500)
Subject: Merge pull request #387 from mhaskel/merge_1.6.x
X-Git-Tag: 1.8.0~34
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1d20fa798ea3f32e195f1d950f1f53cb188c2705;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #387 from mhaskel/merge_1.6.x

Merge 1.6.x
---

1d20fa798ea3f32e195f1d950f1f53cb188c2705