From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Sep 2008 18:01:12 +0000 (-0400)
Subject: Merge branch 'master' of file:///srv/git/ikiwiki.info
X-Git-Tag: 2.63~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/dd349d69ea2361360b4534d9c77806345ff490ad

Merge branch 'master' of file:///srv/git/ikiwiki.info

Conflicts:

	doc/todo/page_edit_disable.mdwn
---

dd349d69ea2361360b4534d9c77806345ff490ad
diff --cc doc/todo/page_edit_disable.mdwn
index ee7c58d4e,3cc6b5f38..c5b666656
--- a/doc/todo/page_edit_disable.mdwn
+++ b/doc/todo/page_edit_disable.mdwn
@@@ -43,7 -43,4 +43,9 @@@ by Cron. I haven't decided how to do i
  
  >> I'm glad you agree that it may make sense :) --[[Paweł|ptecza]]
  
 +>> We're in a similar situation with http://web.monkeysphere.info 
 +>> - wanting cgiurl so that our recentchanges page displays links, 
 +>> but not wanting to enable editing of pages (since we're also 
 +>> rsync'ing the html pages to mirrors) --[[Jamie]]
++
+ editpage plugin implemented, [[done]] --[[Joey]]