From: Micah Anderson <micah@riseup.net>
Date: Sat, 31 Jan 2009 23:58:26 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~156^2^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6923ef580f068ff535af273714e59235260ab7b6;p=monkeysphere.git

Merge commit 'dkg/master'
---

6923ef580f068ff535af273714e59235260ab7b6