From 4a7996c2f2d18eed43ed9e60f6ed21ae714577c9 Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Mon, 16 Mar 2009 16:09:44 +0000
Subject: fix merge-o

---
 debian/changelog | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 9887de5..29ba5bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ zephyr (3.0~a1) unstable; urgency=low
   * Kerberos 5 client support; new upstream?
   * GNU config automated update: config.sub     (20070118 to 20080116),
     config.guess     (20070306 to 20080123)
-  * Acknowledge NMUs
-  * Build-depend on x11proto-core-dev.  Closess: #515456
-  * Japanese debconf translation, thanks to Hideki Yamane.  Closes: #510734
 
  -- Karl Ramm <kcr@1ts.org>  Sun, 21 Dec 2008 02:07:58 -0500
 
-- 
cgit v1.2.3