From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 14 May 2014 17:18:18 +0000 (-0400)
Subject: Merge pull request #294 from apenney/14x-merge
X-Git-Tag: 1.5.0~7
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3a4432ad731485c928f67ee2337aaef3c02a7fe8;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #294 from apenney/14x-merge

14x merge
---

3a4432ad731485c928f67ee2337aaef3c02a7fe8