From: Don Armstrong <don@volo>
Date: Sat, 8 Jul 2006 06:45:50 +0000 (-0700)
Subject: merge back in source merges to fix the broken repository
X-Git-Tag: release/2.6.0~585^2^2~103
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f3a25fc7566f8a4a98996a0e01fcb03dc0adf72b;p=debbugs.git

merge back in source merges to fix the broken repository
---

f3a25fc7566f8a4a98996a0e01fcb03dc0adf72b
diff --cc debian/changelog
index 5fbd4b18,91b99921..7929ba2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -113,9 -113,11 +113,13 @@@ debbugs (2.4.2) UNRELEASED; urgency=lo
        UTF8 material. (closes: #364026)
      - Add links to Closes: text for closed bugs. (closes: #320986)
      - Add X-$gProject-PR-Source: line (closes: #219230)
 +    - Use the %cats data structure properly in pkgreport.cgi
 +      (closes: #367514)  
-   
+     - Document nnn.*@foobar addresses (closes: #188670)
+     - Support cloned bugs in control blocking (closes: #337329)
+     - Indicate which bugs are blocked after blocking (closes: #367496)
+     - Obey package for usertags (closes: #376528)
 -  
++
    
   -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100