From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 28 Aug 2008 03:01:11 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.12-1~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c584f334bc2d9751a300739430d8c191616043a2;p=monkeysphere.git

Merge commit 'jamie/master'
---

c584f334bc2d9751a300739430d8c191616043a2