From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 1 Oct 2013 21:53:59 +0000 (-0700)
Subject: Merge branch 'master' into don/libravatar
X-Git-Tag: release/2.6.0~279
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8623fd34da118a1bdcf96932058935e0c15bcd72;hp=d4b9a1bfe03c6ec1451c8f9178bb5a7458e9ae3e;p=debbugs.git

Merge branch 'master' into don/libravatar
---

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index be6b6c6..7ef4aaf 100644
--- a/t/13_utf8_mail.t
+++ b/t/13_utf8_mail.t
@@ -56,7 +56,7 @@ send_message(to=>'submit@bugs.something',
 			 From => 'föoff@bugs.something',
 			 Subject => 'Submiting a bug',
 			],
-	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=><<EOF2}]) or fail('Unable to send message');
+	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=>encode_utf8(<<EOF2)}]) or fail('Unable to send message');
 Package: foo
 Severity: normal
 
diff --git a/t/15_rebuild_indexdb.t b/t/15_rebuild_indexdb.t
index a3036ec..a0ca910 100644
--- a/t/15_rebuild_indexdb.t
+++ b/t/15_rebuild_indexdb.t
@@ -55,7 +55,7 @@ send_message(to=>'submit@bugs.something',
 			 From => 'föoff@bugs.something',
 			 Subject => 'Submiting a bug',
 			],
-	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=><<EOF2}]) or fail('Unable to send message');
+	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=>encode_utf8(<<EOF2)}]) or fail('Unable to send message');
 Package: foo
 Severity: normal