From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 13 Jun 2008 16:48:07 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c84af854b419250a79352ffc0bf4d66d1982d6a;p=monkeysphere.git

Merge commit 'jrollins/master'
---

5c84af854b419250a79352ffc0bf4d66d1982d6a