From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 21 Jul 2008 21:27:50 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.55~87
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=18d24036477223794e8319428cd7ba971129c29c

Merge branch 'master' into tova

Conflicts:

	debian/changelog
---

18d24036477223794e8319428cd7ba971129c29c
diff --cc debian/changelog
index bcfb411b0,86a770357..04d4fc662
--- a/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