Merge branch 'master' into next

diff --cc IkiWiki/Plugin/comments.pm
Simple merge

diff --cc debian/changelog
index 62ff1ba6f92c42ee311263a6333d459bb8198190,96a70fcc9a8809c259d0f313b51145b992ed5483..9a96f7415d6a4856c2e971eaea659ca451bef3ec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -19,8 -4,9 +19,9 @@@ ikiwiki (2.72) unstable; urgency=lo
    * Add deprecation warning for GlobLists, which will stop working in 3.0.
    * camelcase: Add camelcase_ignore setting.
    * googlecalendar: Add runtime deprecation warning.
+   * comments: Deal with users entering unqualified or partial urls.
  
 - -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
  
  ikiwiki (2.71) unstable; urgency=low