Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere

Conflicts:
	doc/george/changelog

diff --cc doc/george/changelog
index 34c03e4ebb3f97071b16af7bdf054a2aa8ecd6a9,b528fd07f97d8672403eed54f034b6aa65c26b5d..30aa2b1b93f0ce99732045e05f26d33dc7848a13
--- 1/doc/george/changelog
--- 2/doc/george/changelog
+++ b/doc/george/changelog
@@@ -7,17 -7,11 +7,18 @@@
  *  changes to this system (first command at top, last at bottom)             *
  ******************************************************************************
  
-       
 +2009-01-30 - micah
 +      * 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