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

Conflicts:

	doc/todo/page_edit_disable.mdwn

diff --cc doc/todo/page_edit_disable.mdwn
index ee7c58d4eecfb8d91e28954820248c5429959235,3cc6b5f38c2582c61f537d2366a70b309ee08398..c5b666656a9e06680b1578a5629ca08a8df39b44
--- 1/doc/todo/page_edit_disable.mdwn
--- 2/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]]