From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 04:34:03 +0000 (-0400)
Subject: Merge branch 'autotag'
X-Git-Tag: 3.20100427~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ee571390e3697a3b738ea6791ac7f07052a709c;p=ikiwiki.git

Merge branch 'autotag'
---

3ee571390e3697a3b738ea6791ac7f07052a709c
diff --cc debian/changelog
index 647124b8a,a63860088..0ab04f522
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,8 +1,8 @@@
 -ikiwiki (3.20100415) UNRELEASED; urgency=low
 +ikiwiki (3.20100422) UNRELEASED; urgency=low
  
    [ Joey Hess ]
+   * tag: Automatic creation of tag pages can now be enabled using
+     the tag_autocreate setting. (David Riebenbauer)
    * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
    * comments: Fix missing entity encoding in title.
    * txt: Add a special case for robots.txt.