Merge branch 'master' of ssh://git.ikiwiki.info

diff --combined doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
index 0b9ed08beda515d2cd14271cf2dbe038c9c6c443,318f79d6af4478aa03441bd9a80ba88bd4edf501..cacd2b73b946c92e628163e06f2b13db6416bdb5
--- 1/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
--- 2/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
+++ b/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
@@@ -1,8 -1,9 +1,11 @@@
+ [[!template id=gitbranch branch=smcv/ready/less-open author="[[smcv]]"]]
+ [[!tag patch]]
+ 
  The [[plugins/opendiscussion]] plugin allows pages named according to
  the `discussionpage` setting to be edited anonymously, even if
  `discussion => 0` is set.
  
  (If it respected the `discussion` option, the combination of
  `opendiscussion` and `moderatedcomments` might be good for blogs.)
 +
 +[[done]] --[[smcv]]