From: Micah Anderson Date: Fri, 30 Jan 2009 16:37:51 +0000 (-0500) Subject: Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere X-Git-Tag: monkeysphere_0.23~163^2~2^2 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8e6fcc118095adc58335c594f50d367393d8f61a;hp=930b0742dc2cf88015272057374ca68c94e40597;p=monkeysphere.git Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere Conflicts: doc/george/changelog --- diff --git a/doc/george/changelog b/doc/george/changelog index 34c03e4..30aa2b1 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -11,13 +11,14 @@ * Replaced nullmailer with postfix, nullmailer doesn't handle aliases and insisted either on constantly respooling mail when there was no where to go. - + 2009-01-24 - micah * Configured /etc/aliases to have root go to mjgoins, micah, dkg, jrollins * Configured /etc/nullmailer/remotes to have mail.riseup.net so remote delivery will work * Removed the hundreds of queued cron emails that had resulted in 30gig of mail.err logs * Rotated the giant logs out * aptitude update && aptitude full-upgrade + 2008-10-29 - dkg * aptitude update && aptitude full-upgrade