Merge commit 'schmonz/master' into cvs

Conflicts:
	IkiWiki/Plugin/cvs.pm

diff --cc IkiWiki/Plugin/cvs.pm
index 9f91c933508b0f6fe725704dafa21a967064af7c,8409bebedb4cd4bb26b4119c674a673ec38a5886..2c2445f399068ac43824c2b1b8291982b68e60a0
--- 1/IkiWiki/Plugin/cvs.pm
--- 2/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -241,17 -219,15 +219,17 @@@ sub rcs_add ($) 
                        # file
                        my $filemime = File::MimeInfo::default($file);
                        if (defined($filemime) && $filemime eq 'text/plain') {
-                               cvs_runcvs(['add', $file]) ||
+                               cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");
 -                      } else {
 +                      }
 +                      else {
-                               cvs_runcvs(['add', '-kb', $file]) ||
+                               cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }
 -              } else {
 +              }
 +              else {
                        # directory
-                       cvs_runcvs(['add', $file]) ||
+                       cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");
                }
        }