Ditch extra blank lines (closes: #494843)

diff --git a/debian/changelog b/debian/changelog
index 73da9d2b66b7a7f95940a761d9ea76dae4ab27ce..c3adfb7a29d4eca79275a39c1739f104d75bfb73 100644 (file)
--- 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 6dfd6acf46d38cd3d0c0d96bb2ff1af308352ee8..b2f7c4dc1b3cfe7c0f0ffb4726d16d501bd93523 100644 (file)
--- 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 a7394de7429f924850e0a2292790b1c6d102e064..e15ea5a55cf9e53fec1ba5b90544f7b7d1bf1737 100644 (file)
--- 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