From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 6 Jan 2006 09:38:53 +0000 (+0000)
Subject: * merged with bubulle
X-Git-Tag: 0.7.24ubuntu1~275^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/30354d7eafc5f57a477ae0fd19faa21cb0c149eb

* 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
---

30354d7eafc5f57a477ae0fd19faa21cb0c149eb