From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 1 Aug 2008 02:55:59 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.7-1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5df4f6f51830558e50061922b659c14b8d4d9e0;p=monkeysphere.git

Merge commit 'jrollins/master'
---

b5df4f6f51830558e50061922b659c14b8d4d9e0