Merge branch 'master' into commentreorg

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

diff --cc debian/NEWS
index 8f456bced2e9bcafd74efbdc4644ce5f4ab4ba3e,e65a154577574525af25b6b3839fc41a1a8fd114..68f0a207b4edb94f4011688e25785dc729c6c541
--- 1/debian/NEWS
--- 2/debian/NEWS
+++ b/debian/NEWS
@@@ -8,13 -8,12 +8,18 @@@ ikiwiki (3.20100505) UNRELEASED; urgenc
      <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
      <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
      </TMPL_IF>
 +  
 +  Also, there is a new "comment()" pagespec, that can be used to match a
 +  comment on a page. It is recommended it be used instead of the old
 +  method of using a pagespec such as "internal(comment_*)" to match
 +  things that looked like comments. The old pagespec will now also match
 +  comments that are held for moderation; likely not what you want.
  
+   There have also been some changes to the style.css in this version,
+   particularly to support the new openid selector. If you have a modified
+   version, of style.css, updating it (or moving it to local.css) is
+   recommended.
+ 
   -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 21:47:08 -0400
  
  ikiwiki (3.20100427) unstable; urgency=low

diff --cc debian/changelog
Simple merge