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

Merge commit 'jrollins/master'
---

1fa2912aac2636bc6a4d8eda089c0e285f88d141