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

Merge branch 'master' into don/libravatar

Conflicts:
	Debbugs/CGI/Bugreport.pm
	debian/control
---

d4b9a1bfe03c6ec1451c8f9178bb5a7458e9ae3e
diff --cc Debbugs/CGI/Bugreport.pm
index 8d3452d,d9a8744..2e53892
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@@ -148,10 -148,10 +148,10 @@@ sub display_entity 
                     if ($_ eq 'From' and $param{avatars}) {
                         my $libravatar_url = __libravatar_url(decode_rfc1522($head_field));
                         if (defined $libravatar_url and length $libravatar_url) {
-                            push @headers,q(<img src="http://).$libravatar_url.qq(">\n);
 -                           push @headers,q(<img src=").$libravatar_url.qq(" alt="">\n);
++                           push @headers,q(<img src="http://).$libravatar_url.qq(" alt="">\n);
                         }
                     }
- 		   push @headers, qq(<p><span class="header">$_:</span> ) . html_escape(decode_rfc1522($head_field))."</p>\n";
+ 		   push @headers, qq(<div class="header"><span class="headerfield">$_:</span> ) . html_escape(decode_rfc1522($head_field))."</div>\n";
  	      }
  	      print {$output} join(qq(), @headers);
  	 } else {