Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/show.tmpl

diff --cc templates/html/show.tmpl
index c72596432b1fc6437763f078f64f8e4a0a6399bc,eec364b61c8a8c2687069bca031ffce027778f77..8f76bb275317586cd306d06024214b4c663e41ee
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -106,15 -112,16 +106,15 @@@
  [%- FOREACH maintainers;
    mailarchiveurl = '';
    IF (matches = mail.match('^(.*)@lists\.debian\.org$'));
-       mailarchiveurl = 'http://lists.debian.org/' _ matches.0 _ '/';
+       mailarchiveurl = 'http://lists.debian.org/' _ uri_escape(matches.0) _ '/';
    ELSIF (matches = mail.match('^(.*)@lists\.alioth\.debian\.org$'));
-       mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ matches.0 _ '/';
+       mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ uri_escape(matches.0) _ '/';
    ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
-       mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ matches.0 _ '/';
+       mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ uri_escape(matches.0) _ '/';
    END -%]
    [%- '<ul>' IF loop.first -%]
-       <li><a href="mailto:[% mail %]">[% name | html %]</a>
+       <li><a href="mailto:[% mail | html %]">[% name | html %]</a>
 -      (<a href="[% ddpo_url %][% uri_escape(mail) %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>
 -      [%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>[% END %])
 +      [%- IF mailarchiveurl %](<a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>)[% END %]
        </li>
    [%- '</ul>' IF loop.last -%]
  [%- END -%]