Merge branch 'master' into tova

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 198455f37b438abe00ef9ee5b2b3715cf69711b8,d7cbf38b5bb1cba9db2c39057acecb225c3d67e1..1320e4f413855402c17f8b421401e1d4d2c9716b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -25,11 -25,8 +25,13 @@@ ikiwiki (2.66) UNRELEASED; urgency=lo
      page, and is preserved across rebuilds.
    * editpage: Be more aggressive (and less buggy) about cleaning up
      temporary files rendered during page preview.
 +  * Add an indexpages option, which causes foo/index.mdwn to be the source
 +    for page foo when foo.mdwn doesn't exist. Also, when it's enabled,
 +    creating a new page will save it to foo/index.mdwn by default.
 +    Closes: #474611
 +    (Sponsored by The TOVA Company.)
+   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
+     authentication. Closes: #500524 
  
   -- Joey Hess <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400