Merge branch 'master' into autoconfig

Conflicts:

	IkiWiki/Plugin/git.pm
	debian/changelog
	po/ikiwiki.pot

diff --cc IkiWiki/Plugin/git.pm
index 6f0ac56d5c3b13204c92d0dda1c0dbac417d07d4,1fa9188aa3c29fbfa35065382bb0c92ef5eb25b8..b683e4ec3b7fbba4b1f41c5bb7ac96c074ec2fd2
--- 1/IkiWiki/Plugin/git.pm
--- 2/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@@ -414,11 -336,23 +414,23 @@@ sub rcs_commit_staged ($$$) 
                $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
        }
  
 -      $message = possibly_foolish_untaint($message);
++      $message = IkiWiki::possibly_foolish_untaint($message);
+       my @opts;
+       if ($message !~ /\S/) {
+               # Force git to allow empty commit messages.
+               # (If this version of git supports it.)
+               my ($version)=`git --version` =~ /git version (.*)/;
+               if ($version ge "1.5.4") {
+                       push @opts, '--cleanup=verbatim';
+               }
+               else {
+                       $message.=".";
+               }
+       }
+       push @opts, '-q';
        # git commit returns non-zero if file has not been really changed.
        # so we should ignore its exit status (hence run_or_non).
-       $message = IkiWiki::possibly_foolish_untaint($message);
-       if (run_or_non('git', 'commit', '--cleanup=verbatim',
-                      '-q', '-m', $message)) {
+       if (run_or_non('git', 'commit', @opts, '-m', $message)) {
                if (length $config{gitorigin_branch}) {
                        run_or_cry('git', 'push', $config{gitorigin_branch});
                }

diff --cc debian/changelog
index 4954c77377ce6489387fad28dc230e5189d2195d,1290904f8bac0af7a4044fe9a4269fedf20b3edb..440910313131e8e21be85a0b9a7591c8b04df27d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,4 +1,20 @@@
- ikiwiki (2.56) UNRELEASED; urgency=low
 +ikiwiki (2.60) UNRELEASED; urgency=low
 + 
 +  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
 +    can be used create 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) unstable; urgency=low
  
    * autoindex: New plugin that generates missing index pages.
      (Sponsored by The TOVA Company.)

diff --cc doc/plugins/write.mdwn
Simple merge

diff --cc doc/todo/color_plugin.mdwn
Simple merge