From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 12 Jun 2008 13:46:40 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba14c70659e154c3af63e1ee2480a6a75b7ac0e5;p=monkeysphere.git

Merge commit 'jrollins/master'
---

ba14c70659e154c3af63e1ee2480a6a75b7ac0e5