Merge pull request #330 from dantman/master
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 30 Jul 2014 18:44:51 +0000 (14:44 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 30 Jul 2014 18:44:51 +0000 (14:44 -0400)
Fix inconsistent $proxy_host handling in apt and apt::ppa.


Trivial merge