From: Daniele Sluijters <github@daenney.net>
Date: Mon, 30 Jun 2014 16:59:10 +0000 (+0200)
Subject: Merge pull request #322 from cmurphy/master
X-Git-Tag: 1.6.0~16
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cf54221bd3e2b79474dc6c5cb4d6303f659eccfa;hp=cf54221bd3e2b79474dc6c5cb4d6303f659eccfa;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #322 from cmurphy/master

Synchronize .travis.yml
---