]> git.saurik.com Git - apt.git/commitdiff
Merge branch 'fix-https-noproxy' of github.com:patcable/apt
authorJulian Andres Klode <jak@debian.org>
Wed, 27 Apr 2016 21:24:51 +0000 (23:24 +0200)
committerJulian Andres Klode <jak@debian.org>
Wed, 27 Apr 2016 21:24:51 +0000 (23:24 +0200)

Trivial merge