Merge branch 'tova' into autoconfig

Conflicts:

	debian/changelog

diff --cc IkiWiki/Plugin/skeleton.pm.example
index 49c4d88f288d024cfed3dd31b62392ea0b201fb4,10c7002e478919ca5b84a74549350ecc815a5377..bbf11e603839a24f787f0f2ec02ac0f7774f9235
--- 1/IkiWiki/Plugin/skeleton.pm.example
--- 2/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@@ -10,8 -10,8 +10,9 @@@ use IkiWiki 2.00
  
  sub import { #{{{
        hook(type => "getopt", id => "skeleton",  call => \&getopt);
 +      hook(type => "getsetup", id => "skeleton",  call => \&getsetup);
        hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "refresh", id => "skeleton", call => \&refresh);
        hook(type => "needsbuild", id => "skeleton", call => \&needsbuild);
        hook(type => "preprocess", id => "skeleton", call => \&preprocess);
        hook(type => "filter", id => "skeleton", call => \&filter);

diff --cc debian/changelog
index 7b4bc42156d94d11ea1590fda10f383676fc01b7,7fd135700aef62b92e76edcb8dc5ddca2c8297b1..c4e4b7f48a34b1bbac5c92b6ed1090662ef37421
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,26 @@@
 +ikiwiki (2.60) UNRELEASED; urgency=low
 + 
 +  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
 +    can be used set up a new wiki in seconds.
 +  * Add getsetup hook, all plugins that add fields to %config should use it.
 +  * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
 +    current configuration.
 +  * Large amounts of internal config data reorg.
 +  * The way wrappers are defined in the setup file has changed. Old setup
 +    files will continue to work, for now.
 +  * Version control backends promoted to first-class plugins.
 +  * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
 +    always to add.
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 +
+ ikiwiki (2.56) UNRELEASED; urgency=low
+ 
+   * autoindex: New plugin that generates missing index pages.
+     (Sponsored by The TOVA Company.)
+ 
+  -- Joey Hess <joeyh@debian.org>  Tue, 29 Jul 2008 15:53:26 -0400
+ 
  ikiwiki (2.55) unstable; urgency=low
  
    * remove: New plugin that adds the ability to remove pages via the web.