merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index 051bfc5da37eab9943512c9de85bc387ddc7356a,6176aa87eaf1ebd06600e68931624a5d812c0686..3b80a8f8a07730870575c2d9539fd190a282326a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,19 +1,17 @@@
 -  * debian/zzapt.cron.daily:
 -    - move cron job to the end of execution (LP: #727685)
+ apt (0.8.13) unstable; urgency=low
+ 
+   [ Thorsten Spindler ]
+   * methods/rsh.cc
+     - fix rsh/ssh option parsing (LP: #678080), thanks to
+       Ville Mattila 
+   
+   [ Michael Vogt ]
+   * apt-pkg/acquire-item.cc:
+     - mark pkgAcqIndexTrans as Index-File to avoid asking the
+       user to insert the CD on each apt-get update
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
+ 
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]