Merge branch '1.6.x' of github.com:puppetlabs/puppetlabs-apt into 1.6.x
authorMorgan Haskel <morgan@puppetlabs.com>
Thu, 7 Aug 2014 18:52:17 +0000 (14:52 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Thu, 7 Aug 2014 18:52:17 +0000 (14:52 -0400)
commitf4dd4f8ab50d9015552befa44ba613cfa15fb72e
tree5634edf567b81a05812ce19ea6dbe95ba7d2e7ff
parent5018cb51914552d5d2f84f729870e09b18fa132f
parent76a508c710fb415100bd96025ad324eb80485302
Merge branch '1.6.x' of github.com:puppetlabs/puppetlabs-apt into 1.6.x