From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Thu, 26 Mar 2015 07:48:14 +0000 (+0100)
Subject: Merge pull request #484 from mhaskel/merge_master_to_next
X-Git-Tag: 2.0.0~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=913a64e1fd9a383cfa39a2bb7487cb2e76d79fa1;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #484 from mhaskel/merge_master_to_next

Merge master to next
---

913a64e1fd9a383cfa39a2bb7487cb2e76d79fa1