merge lp:~mvo/apt/netrc branch, this adds support for a

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 417cd2436da6dbdeb6668d1158716d36c0219769..685c048ea9985fd0d37a6fcbcc501a99b0dd2259 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ apt (0.7.22.4) unstable; urgency=low
   * methods/https.cc:
     - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
       thanks to Brian Thomason for the patch
+  * merge lp:~mvo/apt/netrc branch, this adds support for a
+    /etc/apt/auth.conf that can be used to store username/passwords
+    in a "netrc" style file (with the extension that it supports "/"
+    in a machine definition). Based on the maemo git branch.
 
   [ Brian Murray ]
   * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: