Merge branch 'darcs'

Conflicts:
	debian/changelog

diff --cc IkiWiki/Setup/Automator.pm
Simple merge

diff --cc debian/changelog
index 7810241463ecfb99aa0cf0b24f60eb959a28fda1,2b1f938b30fe6fb7df5a6b1b42d7236fc976df2e..bbc7e6f136df7c661740e4c34a84e27d168757f6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,16 @@@
  ikiwiki (3.10) UNRELEASED; urgency=low
  
+   * darcs: Finally added support for this VCS, thanks to many
+     contributors:
+     - Thomas Schwinge wrote the original file, implementing only rcs_commit.
+     - Benjamin A'Lee contributed an alternative implementation.
+     - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
+     - Simon Michael contributed multiple changes.
+     - Petr Ročkai fixed rcs_recentchanges.
+     - Sven M. Hallberg merged the above and added missing features.
 +  * Add missing newline to Confirm Password prompt.
  
-  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 18:25:33 -0400
+  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
  
  ikiwiki (3.09) unstable; urgency=low