Merge branch 'master' into tova

Conflicts:

	debian/changelog

diff --combined debian/changelog
index bcfb411b001d7dde819d7ec7bdbbdbe0b0a7ea5f,86a7703573bf6c6f8f0a691ad878488351a01683..04d4fc662f73ac2a067b6cc2542caa82f6e90dd2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,9 -3,10 +3,13 @@@ ikiwiki (2.55) UNRELEASED; urgency=lo
    * prefix_directives enabled in doc wiki, all preprocessor directives
      converted. (Simon McVittie)
    * editpage: Don't show attachments link when attachments are disabled.
 +  * All rcs backends need to implement rcs_remove. (Done for svn, git).
 +  * remove: New plugin that adds the ability to remove pages via the web.
 +    (Sponsored by The TOVA Company.)
+   * tag: Allow tagbase to be overridden by starting a tag with "./" or "/".
+     (Simon McVittie)
+   * Really fix bug with links to pages with names containing colons. 
+     Previous fix mised a few cases.
  
   -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400