From: Micah Anderson <micah@riseup.net>
Date: Thu, 19 Jun 2008 03:35:20 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.1-1~17^2~1
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=308aa104f66a40f2426c13b96f48631937502f6b

Merge commit 'dkg/master'

Conflicts:

	doc/MonkeySpec
---

308aa104f66a40f2426c13b96f48631937502f6b