From: Micah Anderson <micah@riseup.net>
Date: Tue, 18 Nov 2008 06:36:18 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.22-1~13^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=647a0fc70e28d641d914f183489d815d4feb7e2b;p=monkeysphere.git

Merge commit 'dkg/master'
---

647a0fc70e28d641d914f183489d815d4feb7e2b