Merge; also move moderators from master/

diff --git a/.gitignore b/.gitignore
index 4da94c140e103b5627112d0527720b565c7e926e..c3e4d59cb2565dd7ec32c570dba3f38c251e435b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,11 @@
 /xlog/log/*/event.log
 /xlog/log/*/event.log.[0-9]
 /xlog/log/*/event.log.[0-9].gz
-/settings
 /crontab.part
 /stump/etc/added-headers
 /stump/etc/added-footer
 /stump/etc/added-footer.new
 /stump/etc/approval.key.txt
+
+/settings
+/moderators

diff --git a/stump/bin/suspicious.pl b/stump/bin/suspicious.pl
index 00654b3bbfbbda628c69ace05a9a5dcf67c7e442..11bde7b5a556bd9f08df5f272cc6222a86f8d425 100755 (executable)
--- a/stump/bin/suspicious.pl
+++ b/stump/bin/suspicious.pl
@@ -129,7 +129,7 @@ close( MESSAGE );
 
 $Subject = "Subject: try again" if( !$Subject );
 
-open( COMMAND, "| sendmail $moderator > /dev/null"  );
+open( COMMAND, "| sendmail -odb -oi $moderator > /dev/null"  );
 
 print COMMAND "From: $ENV{'DECISION_ADDRESS'}
 $Subject ::$Prefix/$MessageNumber