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

Merge commit 'jrollins/master'
---

b93d6398d799376a572414a30d7b4f02beadd137