* merged with bubulle
authorMichael Vogt <michael.vogt@ubuntu.com>
Fri, 6 Jan 2006 09:38:53 +0000 (09:38 +0000)
committerMichael Vogt <michael.vogt@ubuntu.com>
Fri, 6 Jan 2006 09:38:53 +0000 (09:38 +0000)
commit30354d7eafc5f57a477ae0fd19faa21cb0c149eb
tree687e6cf8a0ac4f4dfa3aa3d491da492bbfd16ba6
parent59ef61aa72b3671997ef88a52e0147607438df77
parentae1768a185221736a360faa91f10ec42a572f81f
* merged with bubulle

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-149
   Merge with Michael archive (Debian version)

 * bubulle@debian.org--2005/apt--main--0--patch-150
   Fix typo in apt-get.cc and update PO files

 * bubulle@debian.org--2005/apt--main--0--patch-151
   Update French translation (and document the update-po I ran previously)

 * mvo@debian.org--2005/apt--debian-sid--0--patch-16
   * merged with main