From: Micah Anderson <micah@riseup.net>
Date: Wed, 13 Aug 2008 04:31:11 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~31^2~6
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=4d54f1d8b9a3d9ee4e6bd0b0d9fdccb99e6a6245

Merge commit 'dkg/master'
---

4d54f1d8b9a3d9ee4e6bd0b0d9fdccb99e6a6245