Merge branch 'master' into templatemove

diff --combined debian/changelog
index 425e28fa6a352776a2e26ba8b8fc58956043448c,f9d012e42faf3cc0adcb45dc76be09694ac20df1..53febb43362b7a8bbbae7f526d174c100f33803a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,13 @@@
- ikiwiki (3.20100422) UNRELEASED; urgency=low
+ ikiwiki (3.20100424) UNRELEASED; urgency=low
  
    [ Joey Hess ]
    * tag: Automatic creation of tag pages can now be enabled using
      the tag_autocreate setting. (David Riebenbauer)
 +  * Customised templates can now be included in the source of wikis
 +    (and also in underlays), and dependencies on them are tracked.
 +  * TMPL_INCLUDE is no longer supported in any template.
 +  * underlay: Removed the add_templates option.
 +  * Add template_depends function to plugin API.
    * 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.
@@@ -71,6 -66,9 +71,9 @@@
      (Jelmer Vernooij)
    * Quite a lot of new optimisations, and one major fix to a recent
      performance regression.
+   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
+     the top of the web root. This is another things that requires a wiki
+     rebuild on upgrade to this version.
  
   -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400