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

Merge commit 'jrollins/master'
---

43504b118f0eb3a383687b2398b18199f6a307e7