From: Bryan Jen Date: Wed, 22 Jul 2015 23:51:27 +0000 (-0700) Subject: Merge pull request #549 from mhaskel/merge_master_to_2.1.x X-Git-Tag: 2.1.1~2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=1f7cff57059c768ea0b33fd7cd13dbc50518ba51;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #549 from mhaskel/merge_master_to_2.1.x Merge master to 2.1.x --- 1f7cff57059c768ea0b33fd7cd13dbc50518ba51