From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 8 Mar 2008 23:42:34 +0000 (-0500)
Subject: Merge branch 'master' of http://micah.riseup.net/git/monkeysphere
X-Git-Tag: monkeysphere_0.1-1~93^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=5cb3545de2896f9564760fbd9615039f17998c74;p=monkeysphere.git

Merge branch 'master' of micah.riseup.net/git/monkeysphere
---

5cb3545de2896f9564760fbd9615039f17998c74