Merge branch 'master' of /opt/git/clearscm

Conflicts:
	clearadm/log/clearagent.pl.log
	clearadm/var/run/clearagent.pl.pid
	clearadm/var/run/cleartasks.pl.pid

diff --git a/bin/bice.pl b/bin/bice.pl
index f1a6358..e875791 100755 (executable)
--- a/bin/bice.pl
+++ b/bin/bice.pl
@@ -66,7 +66,7 @@ my $security_logfile = '/var/log/auth.log';
 # Customize these variables
 my $domain   = 'DeFaria.com';
 my $contact  = 'Andrew@DeFaria.com';
-my $location = 'San Diego, California, USA';
+my $location = 'Santa Clara, California, USA';
 my $UTC             = 'UTC-8';
 my $mailhost = $domain;
 # End customize these variables

diff --git a/clearadm/log/cleartasks.pl.log b/clearadm/log/cleartasks.pl.log
deleted file mode 100644 (file)
index fc048bc..0000000
--- a/clearadm/log/cleartasks.pl.log
+++ /dev/null
@@ -1 +0,0 @@
-cleartasks.pl V1.25 started at Mon Jul 15 12:53:53 2013

diff --git a/maps/log/mapsscrub.log b/maps/log/mapsscrub.log
new file mode 100644 (file)
index 0000000..28c06ce
--- /dev/null
+++ b/maps/log/mapsscrub.log
@@ -0,0 +1,6 @@
+                  MAPS Scrubber
+
+User ID           Age  Email    Log   List User's Emails
+----------------- --- ------ ------ ------ -------------
+andrew             30      8     38      1          6323
+Total:            n/a      8     38      1          6323