Merge branch 'ready/html5'

diff --cc IkiWiki/CGI.pm
Simple merge

diff --cc 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/