From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Jun 2008 03:42:41 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.1-1~17
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=18c15c1adf65d47df5b3753c99f06092d81906d0

Merge commit 'micah/master'
---

18c15c1adf65d47df5b3753c99f06092d81906d0