From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 24 Jun 2008 04:50:14 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.3-1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ab38905ecc678d8256363e228bca20eb0334a0;p=monkeysphere.git

Merge commit 'jrollins/master'
---

95ab38905ecc678d8256363e228bca20eb0334a0