From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 20 Sep 2008 16:04:44 +0000 (+0200)
Subject: Merge branch 'merge'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd186206ec1dc771b28b6faf1e9db2db693f47dc;p=dak

Merge branch 'merge'

* merge:
  don't try to remove file --searchdirs, prune some paths from messages

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

fd186206ec1dc771b28b6faf1e9db2db693f47dc
diff --cc tools/debianqueued-0.9/ChangeLog
index 117274ab,01bf71fc..4464d002
--- a/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2008-09-20  Joerg Jaspert  <joerg@debian.org>
 +
 +	* Queue.README (Version): Update the text to match reality with
 +	DEFERRED/DELAYED and the removed mv command
 +
+ 2008-09-20  Thomas Viehmann  <tv@beamnet.de>
+ 
+ 	* debianqueued: Minor fixes on .commands processing.
+ 
  2008-09-15  Joerg Jaspert  <joerg@debian.org>
  
  	* config: Use 15 delayed dirs. Also change maintainer_mail to