From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 26 Jul 2009 14:05:36 +0000 (+0200)
Subject: Ditch extra blank lines (closes: #494843)
X-Git-Tag: release/2.6.0~456^2~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4dc8cbf8ed9c0f26af742821022158ec211012da;p=debbugs.git

Ditch extra blank lines (closes: #494843)
---

diff --git a/debian/changelog b/debian/changelog
index 73da9d2b..c3adfb7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -253,6 +253,7 @@ debbugs (2.4.2~exp0) experimental; urgency=low
   * Allow for tag nnn = baz + foo - bar in service (closes: #505189)
   * Allow trailinng periods after the control stop commands (closes:
     #517834)
+  * Ditch extra blank lines (closes: #494843)
 
   
  -- Don Armstrong <don@debian.org>  Sun, 26 Jul 2009 05:48:16 -0700
diff --git a/templates/en_US/mail/message_body.tmpl b/templates/en_US/mail/message_body.tmpl
index 6dfd6acf..b2f7c4dc 100644
--- a/templates/en_US/mail/message_body.tmpl
+++ b/templates/en_US/mail/message_body.tmpl
@@ -1,3 +1,2 @@
-{include('mail/header')}
-{$body}
+{include('mail/header')}{$body}
 {include('mail/footer')}
\ No newline at end of file
diff --git a/templates/en_US/mail/process_ack.tmpl b/templates/en_US/mail/process_ack.tmpl
index a7394de7..e15ea5a5 100644
--- a/templates/en_US/mail/process_ack.tmpl
+++ b/templates/en_US/mail/process_ack.tmpl
@@ -7,4 +7,4 @@ send it to { $refreplyto }.
 
 Please do not send mail to {$config{maintainer_email}} unless you wish
 to report a problem with the {ucfirst($config{bug})}-tracking system.
-{$brokenness}
+{$brokenness}
\ No newline at end of file