Merge branch 'ready/html5'

diff --combined IkiWiki/CGI.pm
index f448db6ef8a213fa84d57f72ad236569c510d304,8fdde1a2e7cf0fe736069705956ea50e0f64d835..61af830f859bcd4407cb845472a72d44eeed5c67
--- 1/IkiWiki/CGI.pm
--- 2/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@@ -67,9 -67,6 +67,6 @@@ sub cgitemplate ($$$;@) 
        if (exists $params{page}) {
                $page=delete $params{page};
                $params{forcebaseurl}=urlto($page);
-               if (! $config{html5}) {
-                       $params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
-               }
        }
        run_hooks(pagetemplate => sub {
                shift->(
@@@ -81,9 -78,6 +78,6 @@@
        templateactions($template, "");
  
        my $baseurl = baseurl();
-       if (! $config{html5}) {
-               $baseurl = urlabs($baseurl, $topurl),
-       }
  
        $template->param(
                dynamic => 1,
@@@ -122,8 -116,7 +116,8 @@@ sub decode_cgi_utf8 ($) 
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
 -                      $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
 +                      $cgi->param($f, map { decode_utf8 $_ }
 +                              @{$cgi->param_fetch($f)});
                }
        }
  }

diff --combined debian/control
index 78bb683415cadee90b73c123786f8b3f6fc09bd6,c0e6d7d027865935dbae09a0ffa196634735ebc4..a5cac3c016c9d70a3a9540d4e48dce9d00f4e803
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ Build-Depends: perl, debhelper (>= 9
  Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
    libtext-markdown-discount-perl,
    libtimedate-perl, libhtml-template-perl,
-   libhtml-scrubber-perl, wdg-html-validator,
+   libhtml-scrubber-perl,
    libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
 -  libfile-chdir-perl, libyaml-libyaml-perl, python-support, librpc-xml-perl,
 -  libcgi-session-perl, ghostscript,
 -  libmagickcore-6.q16-2-extra | libmagickcore-extra
 -Maintainer: Joey Hess <joeyh@debian.org>
 -Uploaders: Josh Triplett <josh@freedesktop.org>,
 -  Simon McVittie <smcv@debian.org>
 +  libfile-chdir-perl, libyaml-libyaml-perl, librpc-xml-perl,
 +  libcgi-pm-perl, libcgi-session-perl, ghostscript,
 +  libmagickcore-6.q16-2-extra | libmagickcore-extra,
 +  libcgi-formbuilder-perl
 +Maintainer: Simon McVittie <smcv@debian.org>
 +Uploaders: Josh Triplett <josh@freedesktop.org>
  Standards-Version: 3.9.5
  Homepage: http://ikiwiki.info/
  Vcs-Git: git://git.ikiwiki.info/
@@@ -27,7 -27,7 +27,7 @@@ Recommends: gcc | c-compiler
    libc6-dev | libc-dev,
    git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
    libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl,
 -  liblwpx-paranoidagent-perl, libtimedate-perl,
 +  liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-pm-perl,
    libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
    libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl,
    libgravatar-url-perl, librpc-xml-perl,