From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Sep 2008 19:28:30 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.13-1~5^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86f97d40d6fb60f7dde3c7e3a8aab0124f151d35;p=monkeysphere.git

Merge commit 'dkg/master'
---

86f97d40d6fb60f7dde3c7e3a8aab0124f151d35