From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 3 Sep 2008 00:37:25 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.13-1~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8308d8f9ae389c514ddd08a805fe7b07b989342d;p=monkeysphere.git

Merge commit 'jrollins/master'
---

8308d8f9ae389c514ddd08a805fe7b07b989342d