4 Commits (3d3fa243ac9e2bf66ae7b92d7e13a52c69f6129b)

Author	SHA1	Message	Date
Joey Hess	95bfa99e2a	Merge branch 'master' of ssh://git.ikiwiki.info	2013-01-02 15:32:30 -04:00
http://smcv.pseudorandom.co.uk/	97d2c41ed4	+patch	2013-01-02 14:07:42 -04:00
Simon McVittie	6e962a2d74	opendiscussion: don't allow editing discussionpage if discussion is disabled	2013-01-02 18:05:33 +00:00
http://smcv.pseudorandom.co.uk/	2c299c7994		2011-05-26 09:48:24 +00:00