From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Jan 2013 19:32:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95bfa99e2abf9d717f0eb42891f3175edcb7a8e5?ds=sidebyside;hp=-c

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

95bfa99e2abf9d717f0eb42891f3175edcb7a8e5
diff --combined doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
index 0b9ed08be,318f79d6a..cacd2b73b
--- a/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]]