remove conflict artifact

[developers-reference.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 47cb1857ebacade926caa05555130c0c47e32e69..ea0551fb42fd169631e823985ca49ae1dc4fe8c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
 developers-reference (3.3.4) WORKING VERSION; urgency=low
 
   * Josip Rodin:
-    + fixed language in the PTS section, prompted by a patch from
-      Romain FRANCOISE, thank you, closes: #197741.
-    + updated the mailing lists section (again)
-    + documented Alioth, somewhat
-
+    - fixed language in the PTS section, prompted by a patch from
+      Romain FRANCOISE, thank you; closes: #197741
+    - updated the mailing lists section (again)
+    - documented Alioth, somewhat
+  * Frédéric Bothamy
+    - French translation updated to version 3.3.3 (more or less)
+    - proofread by Patrice Karatchentzeff
+  * Matt Zimmerman
+    - Don't upload security updates directly to stable
+    - Always include an external reference in security changelog entries
+    - Be careful not to re-use a version number in security uploads
+  
  -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 04:22:22 -0400
 
 developers-reference (3.3.3) unstable; urgency=low