From: Jamie McClelland <jm@mayfirst.org>
Date: Wed, 6 Aug 2008 14:24:55 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~62
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=22a148924d41bb1489978174f76b5a30cb3ae1aa;p=monkeysphere.git

Merge commit 'dkg/master'
---

22a148924d41bb1489978174f76b5a30cb3ae1aa