From: Micah Anderson <micah@riseup.net>
Date: Sun, 26 Oct 2008 16:34:56 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.17-1~6^2~4^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20e88948f035c56d51f07c53de50b75df57fc816;p=monkeysphere.git

Merge commit 'dkg/master'
---

20e88948f035c56d51f07c53de50b75df57fc816