From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 15 Nov 2008 23:21:25 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.22-1~13^2~6
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=b259e0e8f928b4ac082fbe66c7c170b611b932c9;p=monkeysphere.git

Merge commit 'micah/master'
---

b259e0e8f928b4ac082fbe66c7c170b611b932c9
diff --cc doc/zimmerman/changelog
index e119e23,a92198c..e833b1e
--- a/doc/zimmerman/changelog
+++ b/doc/zimmerman/changelog
@@@ -12,7 -12,5 +12,8 @@@
  	* aptitude install sks
  	* cd /var/lib/sks/dump ; wget -q -r -np -nd -A bz2,SHA256,asc \
  	  http://nynex.net/keydump/ -e robots=off
+ 	* install monkeysphere 0.21-2 package
  
 +2008-11-15 - jamie
 +  * aptitude install esmtp-run mailx
 +	* edited /etc/esmtp-run, configured to relay to bulk.mayfirst.org