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 34c03e4ebb3f97071b16af7bdf054a2aa8ecd6a9..30aa2b1b93f0ce99732045e05f26d33dc7848a13 100644 (file)
--- 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