]> git.saurik.com Git - apt.git/commitdiff
Merge remote-tracking branch 'geissert/proxy-keep-alive' into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 17 Jul 2013 14:18:05 +0000 (16:18 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 17 Jul 2013 14:18:05 +0000 (16:18 +0200)

Trivial merge