From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 12 Sep 2014 21:24:49 +0000 (-0400)
Subject: Merge branch '1.6.x' into test
X-Git-Tag: 1.7.0~7^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6540b7ba245207ab1e4832dff9c31a480dddf33f;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch '1.6.x' into test
---

6540b7ba245207ab1e4832dff9c31a480dddf33f