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

Merge commit 'jamie/master'
---

6853904a8e983cacea6d798c95d7ab9f328ee807