* merged with bubulle

[ntk/apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9194b8a..ac1e0e6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ apt (0.6.41.1) unstable; urgency=low
   * allow cdrom failures and fallback to other sources in that case
     (closes: #44135)
   * better error text when dpkg-source fails 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
+    - patch-99: Added Galician translation
+    - patch-100: Completed Danish translation (Closes: #325686)
+    - patch-104: French translation completed
+  * applied frensh man-page update (thanks to Philippe Batailler)
+  
+ -- 
 
 apt (0.6.41) unstable; urgency=low