Merge branch 'master' into don/libravatar

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

diff --cc Debbugs/CGI/Bugreport.pm
index 8d3452db06985287f465c8fa63580bd821e6b640,d9a8744ec246a8fad827b4a15790b92b2137668f..2e53892ca5ced8e019b24b5bf291640a45556432
--- 1/Debbugs/CGI/Bugreport.pm
--- 2/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 {

diff --cc debian/control
Simple merge