From: Ken Barber <ken@bob.sh>
Date: Sun, 2 Jun 2013 17:56:10 +0000 (+0100)
Subject: Merge branch 'proxy'
X-Git-Tag: 1.1.1~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aacce08bcf16b5582996c5d5aafc32ac59479120;hp=-c;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'proxy'

* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp
---

aacce08bcf16b5582996c5d5aafc32ac59479120