More security updates

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2395 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/debian/changelog b/debian/changelog
index 7874f53efb7fc7727ba8f3f7b1fd6928ae2e4458..c77679c659c21fa218a5abb3b6f48932a4f33302 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,14 @@ developers-reference (3.3.4) WORKING VERSION; urgency=low
   * 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
 
+>>>>>>> 1.168
 developers-reference (3.3.3) unstable; urgency=low
 
   * Frédéric Bothamy