From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 30 Apr 2009 22:45:59 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~28^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4ea066ebeb9b01afe213db3455ad1a1ff69c39ea;hp=dfdaec4fdfeeca291b40e8d1c2bec314c230d83d;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/doc/george/changelog b/doc/george/changelog
index 7895f7d..45345be 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,9 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2009-04-21 - micah
+	* aptitude update && aptitude full-upgrade (git-core DSA)
+	
 2009-04-12 - dkg
 	* aptitude update && aptitude full-upgrade
 	* (checked and found that monkeysphere version 0.24-1 is already