Merge branch 'autotag'

diff --cc IkiWiki.pm
Simple merge

diff --cc debian/NEWS
Simple merge

diff --cc debian/changelog
index 647124b8ac7958ffc567cfcd350c39e7ba87da13,a63860088a16c3a8b24e28bb0be5cedb46a91e0c..0ab04f522864ab2c1bff2bcae802f00b49d01801
--- 1/debian/changelog
--- 2/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.

diff --cc doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
Simple merge