From: Jamie McClelland <jm@mayfirst.org>
Date: Mon, 28 Jul 2008 01:35:08 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.5-1~5
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=4b5f730b70649fa0b8e7b061a2e232c77176cbf6

Merge commit 'dkg/master'
---

4b5f730b70649fa0b8e7b061a2e232c77176cbf6